diff --git a/src/cluster.c b/src/cluster.c
index 9b8b3b3b8..74d6a4d6d 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -812,7 +812,7 @@ void clusterCommandHelp(client *c) {
             NULL
     };
 
-    addExtendedReplyHelp(c, help, clusterCommandSpecialHelp());
+    addExtendedReplyHelp(c, help, clusterCommandExtendedHelp());
 }
 
 void clusterCommand(client *c) {
@@ -911,9 +911,9 @@ void clusterCommand(client *c) {
         }
 
         /* Report TLS ports to TLS client, and report non-TLS port to non-TLS client. */
-        addReplyArrayLen(c, getNumSlaves(n));
-        for (j = 0; j < getNumSlaves(n); j++) {
-            sds ni = clusterGenNodeDescription(c, getSlave(n, j), shouldReturnTlsInfo());
+        addReplyArrayLen(c, clusterNodeNumSlaves(n));
+        for (j = 0; j < clusterNodeNumSlaves(n); j++) {
+            sds ni = clusterGenNodeDescription(c, clusterNodeGetSlave(n, j), shouldReturnTlsInfo());
             addReplyBulkCString(c,ni);
             sdsfree(ni);
         }
@@ -1193,11 +1193,11 @@ void clusterRedirectClient(client *c, clusterNode *n, int hashslot, int error_co
                error_code == CLUSTER_REDIR_ASK)
     {
         /* Report TLS ports to TLS client, and report non-TLS port to non-TLS client. */
-        int port = getNodeClientPort(n, shouldReturnTlsInfo());
+        int port = clusterNodeClientPort(n, shouldReturnTlsInfo());
         addReplyErrorSds(c,sdscatprintf(sdsempty(),
                                         "-%s %d %s:%d",
                                         (error_code == CLUSTER_REDIR_ASK) ? "ASK" : "MOVED",
-                                        hashslot, getPreferredEndpoint(n), port));
+                                        hashslot, clusterNodePreferredEndpoint(n), port));
     } else {
         serverPanic("getNodeByQuery() unknown error.");
     }
@@ -1285,7 +1285,7 @@ static int isReplicaAvailable(clusterNode *node) {
     if (clusterNodeIsFailing(node)) {
         return 0;
     }
-    long long repl_offset = getReplOffset(node);
+    long long repl_offset = clusterNodeReplOffset(node);
     if (clusterNodeIsMyself(node)) {
         /* Nodes do not update their own information
          * in the cluster node list. */
@@ -1312,7 +1312,7 @@ void addNodeToNodeReply(client *c, clusterNode *node) {
     }
 
     /* Report TLS ports to TLS client, and report non-TLS port to non-TLS client. */
-    addReplyLongLong(c, getNodeClientPort(node, shouldReturnTlsInfo()));
+    addReplyLongLong(c, clusterNodeClientPort(node, shouldReturnTlsInfo()));
     addReplyBulkCBuffer(c, clusterNodeGetName(node), CLUSTER_NAMELEN);
 
     /* Add the additional endpoint information, this is all the known networking information
@@ -1347,8 +1347,8 @@ void addNodeToNodeReply(client *c, clusterNode *node) {
 
 void addNodeReplyForClusterSlot(client *c, clusterNode *node, int start_slot, int end_slot) {
     int i, nested_elements = 3; /* slots (2) + master addr (1) */
-    for (i = 0; i < getNumSlaves(node); i++) {
-        if (!isReplicaAvailable(getSlave(node, i))) continue;
+    for (i = 0; i < clusterNodeNumSlaves(node); i++) {
+        if (!isReplicaAvailable(clusterNodeGetSlave(node, i))) continue;
         nested_elements++;
     }
     addReplyArrayLen(c, nested_elements);
@@ -1357,11 +1357,11 @@ void addNodeReplyForClusterSlot(client *c, clusterNode *node, int start_slot, in
     addNodeToNodeReply(c, node);
 
     /* Remaining nodes in reply are replicas for slot range */
-    for (i = 0; i < getNumSlaves(node); i++) {
+    for (i = 0; i < clusterNodeNumSlaves(node); i++) {
         /* This loop is copy/pasted from clusterGenNodeDescription()
          * with modifications for per-slot node aggregation. */
-        if (!isReplicaAvailable(getSlave(node, i))) continue;
-        addNodeToNodeReply(c, getSlave(node, i));
+        if (!isReplicaAvailable(clusterNodeGetSlave(node, i))) continue;
+        addNodeToNodeReply(c, clusterNodeGetSlave(node, i));
         nested_elements--;
     }
     serverAssert(nested_elements == 3); /* Original 3 elements */
diff --git a/src/cluster.h b/src/cluster.h
index 9b422d385..ec64dc8b6 100644
--- a/src/cluster.h
+++ b/src/cluster.h
@@ -35,7 +35,7 @@ struct clusterState;
 /* ---------------------- API exported outside cluster.c -------------------- */
 /* functions requiring mechanism specific implementations */
 void clusterInit(void);
-void clusterInitListeners(void);
+void clusterInitLast(void);
 void clusterCron(void);
 void clusterBeforeSleep(void);
 int verifyClusterConfigWithData(void);
@@ -59,10 +59,10 @@ sds clusterGenNodesDescription(client *c, int filter, int tls_primary);
 sds genClusterInfoString(void);
 /* handle implementation specific debug cluster commands. Return 1 if handled, 0 otherwise. */
 int handleDebugClusterCommand(client *c);
-const char **clusterDebugCommandHelp(void);
+const char **clusterDebugCommandExtendedHelp(void);
 /* handle implementation specific cluster commands. Return 1 if handled, 0 otherwise. */
 int clusterCommandSpecial(client *c);
-const char** clusterCommandSpecialHelp(void);
+const char** clusterCommandExtendedHelp(void);
 
 int clusterAllowFailoverCmd(client *c);
 void clusterPromoteSelfToMaster(void);
@@ -81,9 +81,9 @@ clusterNode* getMyClusterNode(void);
 char* getMyClusterId(void);
 int getClusterSize(void);
 char** getClusterNodesList(size_t *numnodes);
-int nodeIsMaster(clusterNode *n);
 int handleDebugClusterCommand(client *c);
 int clusterNodePending(clusterNode  *node);
+int clusterNodeIsMaster(clusterNode *n);
 char* clusterNodeIp(clusterNode *node);
 int clusterNodeIsSlave(clusterNode *node);
 clusterNode *clusterNodeGetSlaveof(clusterNode *node);
@@ -92,15 +92,15 @@ int clusterNodeTimedOut(clusterNode *node);
 int clusterNodeIsFailing(clusterNode *node);
 int clusterNodeIsNoFailover(clusterNode *node);
 char* clusterNodeGetShardId(clusterNode *node);
-int getNumSlaves(clusterNode *node);
-clusterNode *getSlave(clusterNode *node, int slave_idx);
+int clusterNodeNumSlaves(clusterNode *node);
+clusterNode *clusterNodeGetSlave(clusterNode *node, int slave_idx);
 clusterNode *getMigratingSlotDest(int slot);
 clusterNode *getImportingSlotSource(int slot);
 clusterNode *getNodeBySlot(int slot);
-int getNodeClientPort(clusterNode *n, int use_tls);
+int clusterNodeClientPort(clusterNode *n, int use_tls);
 char* clusterNodeHostname(clusterNode *node);
-const char *getPreferredEndpoint(clusterNode *n);
-long long getReplOffset(clusterNode *node);
+const char *clusterNodePreferredEndpoint(clusterNode *n);
+long long clusterNodeReplOffset(clusterNode *node);
 clusterNode *clusterLookupNode(const char *name, int length);
 
 /* functions with shared implementations */
diff --git a/src/cluster_legacy.c b/src/cluster_legacy.c
index 72ab7428a..98d6f38c3 100644
--- a/src/cluster_legacy.c
+++ b/src/cluster_legacy.c
@@ -41,6 +41,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <math.h>
+#include <sys/file.h>
 
 /* A global reference to myself is handy to make code more clear.
  * Myself always points to server.cluster->myself, that is, the clusterNode
@@ -112,7 +113,7 @@ static inline int getNodeDefaultReplicationPort(clusterNode *n) {
     return server.tls_replication ? n->tls_port : n->tcp_port;
 }
 
-int getNodeClientPort(clusterNode *n, int use_tls) {
+int clusterNodeClientPort(clusterNode *n, int use_tls) {
     return use_tls ? n->tls_port : n->tcp_port;
 }
 
@@ -1028,7 +1029,7 @@ void clusterInit(void) {
     clusterUpdateMyselfHumanNodename();
 }
 
-void clusterInitListeners(void) {
+void clusterInitLast(void) {
     if (connectionIndexByType(connTypeOfCluster()->get_type(NULL)) < 0) {
         serverLog(LL_WARNING, "Missing connection type %s, but it is required for the Cluster bus.", connTypeOfCluster()->get_type(NULL));
         exit(1);
@@ -1755,7 +1756,7 @@ int clusterBumpConfigEpochWithoutConsensus(void) {
 void clusterHandleConfigEpochCollision(clusterNode *sender) {
     /* Prerequisites: nodes have the same configEpoch and are both masters. */
     if (sender->configEpoch != myself->configEpoch ||
-        !nodeIsMaster(sender) || !nodeIsMaster(myself)) return;
+        !clusterNodeIsMaster(sender) || !clusterNodeIsMaster(myself)) return;
     /* Don't act if the colliding node has a smaller Node ID. */
     if (memcmp(sender->name,myself->name,CLUSTER_NAMELEN) <= 0) return;
     /* Get the next ID available at the best of this node knowledge. */
@@ -1877,7 +1878,7 @@ void markNodeAsFailingIfNeeded(clusterNode *node) {
 
     failures = clusterNodeFailureReportsCount(node);
     /* Also count myself as a voter if I'm a master. */
-    if (nodeIsMaster(myself)) failures++;
+    if (clusterNodeIsMaster(myself)) failures++;
     if (failures < needed_quorum) return; /* No weak agreement from masters. */
 
     serverLog(LL_NOTICE,
@@ -1920,7 +1921,7 @@ void clearNodeFailureIfNeeded(clusterNode *node) {
      * 1) The FAIL state is old enough.
      * 2) It is yet serving slots from our point of view (not failed over).
      * Apparently no one is going to fix these slots, clear the FAIL flag. */
-    if (nodeIsMaster(node) && node->numslots > 0 &&
+    if (clusterNodeIsMaster(node) && node->numslots > 0 &&
         (now - node->fail_time) >
         (server.cluster_node_timeout * CLUSTER_FAIL_UNDO_TIME_MULT))
     {
@@ -2070,7 +2071,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
         if (node) {
             /* We already know this node.
                Handle failure reports, only when the sender is a master. */
-            if (sender && nodeIsMaster(sender) && node != myself) {
+            if (sender && clusterNodeIsMaster(sender) && node != myself) {
                 if (flags & (CLUSTER_NODE_FAIL|CLUSTER_NODE_PFAIL)) {
                     if (clusterNodeAddFailureReport(node,sender)) {
                         serverLog(LL_VERBOSE,
@@ -2233,7 +2234,7 @@ int nodeUpdateAddressIfNeeded(clusterNode *node, clusterLink *link,
  * a node that we believed to be a slave is now acting as master in order to
  * update the state of the node. */
 void clusterSetNodeAsMaster(clusterNode *n) {
-    if (nodeIsMaster(n)) return;
+    if (clusterNodeIsMaster(n)) return;
 
     if (n->slaveof) {
         clusterNodeRemoveSlave(n->slaveof,n);
@@ -2281,7 +2282,7 @@ void clusterUpdateSlotsConfigWith(clusterNode *sender, uint64_t senderConfigEpoc
     /* Here we set curmaster to this node or the node this node
      * replicates to if it's a slave. In the for loop we are
      * interested to check if slots are taken away from curmaster. */
-    curmaster = nodeIsMaster(myself) ? myself : myself->slaveof;
+    curmaster = clusterNodeIsMaster(myself) ? myself : myself->slaveof;
 
     if (sender == myself) {
         serverLog(LL_NOTICE,"Discarding UPDATE message about myself.");
@@ -2920,7 +2921,7 @@ int clusterProcessPacket(clusterLink *link) {
                 /* Node is a slave. */
                 clusterNode *master = clusterLookupNode(hdr->slaveof, CLUSTER_NAMELEN);
 
-                if (nodeIsMaster(sender)) {
+                if (clusterNodeIsMaster(sender)) {
                     /* Master turned into a slave! Reconfigure the node. */
                     clusterDelNodeSlots(sender);
                     sender->flags &= ~(CLUSTER_NODE_MASTER|
@@ -2958,7 +2959,7 @@ int clusterProcessPacket(clusterLink *link) {
         int dirty_slots = 0; /* Sender claimed slots don't match my view? */
 
         if (sender) {
-            sender_master = nodeIsMaster(sender) ? sender : sender->slaveof;
+            sender_master = clusterNodeIsMaster(sender) ? sender : sender->slaveof;
             if (sender_master) {
                 dirty_slots = memcmp(sender_master->slots,
                         hdr->myslots,sizeof(hdr->myslots)) != 0;
@@ -2968,7 +2969,7 @@ int clusterProcessPacket(clusterLink *link) {
         /* 1) If the sender of the message is a master, and we detected that
          *    the set of slots it claims changed, scan the slots to see if we
          *    need to update our configuration. */
-        if (sender && nodeIsMaster(sender) && dirty_slots)
+        if (sender && clusterNodeIsMaster(sender) && dirty_slots)
             clusterUpdateSlotsConfigWith(sender,senderConfigEpoch,hdr->myslots);
 
         /* 2) We also check for the reverse condition, that is, the sender
@@ -3017,8 +3018,7 @@ int clusterProcessPacket(clusterLink *link) {
 
         /* If our config epoch collides with the sender's try to fix
          * the problem. */
-        if (sender &&
-            nodeIsMaster(myself) && nodeIsMaster(sender) &&
+        if (sender && clusterNodeIsMaster(myself) && clusterNodeIsMaster(sender) &&
             senderConfigEpoch == myself->configEpoch)
         {
             clusterHandleConfigEpochCollision(sender);
@@ -3083,7 +3083,7 @@ int clusterProcessPacket(clusterLink *link) {
         /* We consider this vote only if the sender is a master serving
          * a non zero number of slots, and its currentEpoch is greater or
          * equal to epoch where this node started the election. */
-        if (nodeIsMaster(sender) && sender->numslots > 0 &&
+        if (clusterNodeIsMaster(sender) && sender->numslots > 0 &&
             senderCurrentEpoch >= server.cluster->failover_auth_epoch)
         {
             server.cluster->failover_auth_count++;
@@ -3438,7 +3438,7 @@ static void clusterBuildMessageHdr(clusterMsg *hdr, int type, size_t msglen) {
     hdr->offset = htonu64(offset);
 
     /* Set the message flags. */
-    if (nodeIsMaster(myself) && server.cluster->mf_end)
+    if (clusterNodeIsMaster(myself) && server.cluster->mf_end)
         hdr->mflags[0] |= CLUSTERMSG_FLAG0_PAUSED;
 
     hdr->totlen = htonl(msglen);
@@ -3869,10 +3869,10 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) {
     /* Node must be a slave and its master down.
      * The master can be non failing if the request is flagged
      * with CLUSTERMSG_FLAG0_FORCEACK (manual failover). */
-    if (nodeIsMaster(node) || master == NULL ||
+    if (clusterNodeIsMaster(node) || master == NULL ||
         (!nodeFailed(master) && !force_ack))
     {
-        if (nodeIsMaster(node)) {
+        if (clusterNodeIsMaster(node)) {
             serverLog(LL_WARNING,
                     "Failover auth denied to %.40s (%s): it is a master node",
                     node->name, node->human_nodename);
@@ -4043,7 +4043,7 @@ void clusterFailoverReplaceYourMaster(void) {
     int j;
     clusterNode *oldmaster = myself->slaveof;
 
-    if (nodeIsMaster(myself) || oldmaster == NULL) return;
+    if (clusterNodeIsMaster(myself) || oldmaster == NULL) return;
 
     /* 1) Turn this node into a master. */
     clusterSetNodeAsMaster(myself);
@@ -4105,7 +4105,7 @@ void clusterHandleSlaveFailover(void) {
      * 3) We don't have the no failover configuration set, and this is
      *    not a manual failover.
      * 4) It is serving slots. */
-    if (nodeIsMaster(myself) ||
+    if (clusterNodeIsMaster(myself) ||
         myself->slaveof == NULL ||
         (!nodeFailed(myself->slaveof) && !manual_failover) ||
         (server.cluster_slave_no_failover && !manual_failover) ||
@@ -4316,7 +4316,7 @@ void clusterHandleSlaveMigration(int max_slaves) {
         if (!(node->flags & CLUSTER_NODE_MIGRATE_TO)) is_orphaned = 0;
 
         /* Check number of working slaves. */
-        if (nodeIsMaster(node)) okslaves = clusterCountNonFailingSlaves(node);
+        if (clusterNodeIsMaster(node)) okslaves = clusterCountNonFailingSlaves(node);
         if (okslaves > 0) is_orphaned = 0;
 
         if (is_orphaned) {
@@ -4591,7 +4591,7 @@ void clusterCron(void) {
 
         /* Orphaned master check, useful only if the current instance
          * is a slave that may migrate to another master. */
-        if (nodeIsSlave(myself) && nodeIsMaster(node) && !nodeFailed(node)) {
+        if (nodeIsSlave(myself) && clusterNodeIsMaster(node) && !nodeFailed(node)) {
             int okslaves = clusterCountNonFailingSlaves(node);
 
             /* A master is orphaned if it is serving a non-zero number of
@@ -4642,7 +4642,7 @@ void clusterCron(void) {
         /* If we are a master and one of the slaves requested a manual
          * failover, ping it continuously. */
         if (server.cluster->mf_end &&
-            nodeIsMaster(myself) &&
+            clusterNodeIsMaster(myself) &&
             server.cluster->mf_slave == node &&
             node->link)
         {
@@ -4912,7 +4912,7 @@ void clusterUpdateState(void) {
      * the first call to this function and not since the server start, in order
      * to not count the DB loading time. */
     if (first_call_time == 0) first_call_time = mstime();
-    if (nodeIsMaster(myself) &&
+    if (clusterNodeIsMaster(myself) &&
         server.cluster->state == CLUSTER_FAIL &&
         mstime() - first_call_time < CLUSTER_WRITABLE_DELAY) return;
 
@@ -4946,7 +4946,7 @@ void clusterUpdateState(void) {
         while((de = dictNext(di)) != NULL) {
             clusterNode *node = dictGetVal(de);
 
-            if (nodeIsMaster(node) && node->numslots) {
+            if (clusterNodeIsMaster(node) && node->numslots) {
                 server.cluster->size++;
                 if ((node->flags & (CLUSTER_NODE_FAIL|CLUSTER_NODE_PFAIL)) == 0)
                     reachable_masters++;
@@ -4980,7 +4980,7 @@ void clusterUpdateState(void) {
             rejoin_delay = CLUSTER_MIN_REJOIN_DELAY;
 
         if (new_state == CLUSTER_OK &&
-            nodeIsMaster(myself) &&
+            clusterNodeIsMaster(myself) &&
             mstime() - among_minority_time < rejoin_delay)
         {
             return;
@@ -5068,7 +5068,7 @@ int verifyClusterConfigWithData(void) {
 /* Remove all the shard channel related information not owned by the current shard. */
 static inline void removeAllNotOwnedShardChannelSubscriptions(void) {
     if (!dictSize(server.pubsubshard_channels)) return;
-    clusterNode *currmaster = nodeIsMaster(myself) ? myself : myself->slaveof;
+    clusterNode *currmaster = clusterNodeIsMaster(myself) ? myself : myself->slaveof;
     for (int j = 0; j < CLUSTER_SLOTS; j++) {
         if (server.cluster->slots[j] != currmaster) {
             removeChannelsInSlot(j);
@@ -5086,7 +5086,7 @@ void clusterSetMaster(clusterNode *n) {
     serverAssert(n != myself);
     serverAssert(myself->numslots == 0);
 
-    if (nodeIsMaster(myself)) {
+    if (clusterNodeIsMaster(myself)) {
         myself->flags &= ~(CLUSTER_NODE_MASTER|CLUSTER_NODE_MIGRATE_TO);
         myself->flags |= CLUSTER_NODE_SLAVE;
         clusterCloseAllSlots();
@@ -5160,7 +5160,7 @@ sds representSlotInfo(sds ci, uint16_t *slot_info_pairs, int slot_info_pairs_cou
 sds clusterGenNodeDescription(client *c, clusterNode *node, int tls_primary) {
     int j, start;
     sds ci;
-    int port = getNodeClientPort(node, tls_primary);
+    int port = clusterNodeClientPort(node, tls_primary);
 
     /* Node coordinates */
     ci = sdscatlen(sdsempty(),node->name,CLUSTER_NAMELEN);
@@ -5492,7 +5492,7 @@ void addNodeDetailsToShardReply(client *c, clusterNode *node) {
     reply_count++;
 
     addReplyBulkCString(c, "endpoint");
-    addReplyBulkCString(c, getPreferredEndpoint(node));
+    addReplyBulkCString(c, clusterNodePreferredEndpoint(node));
     reply_count++;
 
     if (sdslen(node->hostname) != 0) {
@@ -5793,7 +5793,7 @@ char** getClusterNodesList(size_t *numnodes) {
     return ids;
 }
 
-int nodeIsMaster(clusterNode *n) {
+int clusterNodeIsMaster(clusterNode *n) {
     return n->flags & CLUSTER_NODE_MASTER;
 }
 
@@ -5864,7 +5864,7 @@ int clusterNodeIsNoFailover(clusterNode *node) {
     return node->flags & CLUSTER_NODE_NOFAILOVER;
 }
 
-const char **clusterDebugCommandHelp(void) {
+const char **clusterDebugCommandExtendedHelp(void) {
     static const char *help[] = {
         "CLUSTERLINK KILL <to|from|all> <node-id>",
         "    Kills the link based on the direction to/from (both) with the provided node.",
@@ -6174,7 +6174,7 @@ int clusterCommandSpecial(client *c) {
         /* If the instance is currently a master, it should have no assigned
          * slots nor keys to accept to replicate some other node.
          * Slaves can switch to another master without issues. */
-        if (nodeIsMaster(myself) &&
+        if (clusterNodeIsMaster(myself) &&
             (myself->numslots != 0 || dbSize(&server.db[0], DB_MAIN) != 0)) {
             addReplyError(c,
                 "To set a master the node must be empty and "
@@ -6217,7 +6217,7 @@ int clusterCommandSpecial(client *c) {
         }
 
         /* Check preconditions. */
-        if (nodeIsMaster(myself)) {
+        if (clusterNodeIsMaster(myself)) {
             addReplyError(c,"You should send CLUSTER FAILOVER to a replica");
             return 1;
         } else if (myself->slaveof == NULL) {
@@ -6309,7 +6309,7 @@ int clusterCommandSpecial(client *c) {
 
         /* Slaves can be reset while containing data, but not master nodes
          * that must be empty. */
-        if (nodeIsMaster(myself) && dbSize(c->db, DB_MAIN) != 0) {
+        if (clusterNodeIsMaster(myself) && dbSize(c->db, DB_MAIN) != 0) {
             addReplyError(c,"CLUSTER RESET can't be called with "
                             "master nodes containing keys");
             return 1;
@@ -6326,7 +6326,7 @@ int clusterCommandSpecial(client *c) {
     return 1;
 }
 
-const char** clusterCommandSpecialHelp(void) {
+const char** clusterCommandExtendedHelp(void) {
     static const char *help[] = {
         "ADDSLOTS <slot> [<slot> ...]",
         "    Assign slots to current node.",
@@ -6367,11 +6367,11 @@ const char** clusterCommandSpecialHelp(void) {
     return help;
 }
 
-int getNumSlaves(clusterNode *node) {
+int clusterNodeNumSlaves(clusterNode *node) {
     return node->numslaves;
 }
 
-clusterNode *getSlave(clusterNode *node, int slave_idx) {
+clusterNode *clusterNodeGetSlave(clusterNode *node, int slave_idx) {
     return node->slaves[slave_idx];
 }
 
@@ -6395,11 +6395,11 @@ char* clusterNodeHostname(clusterNode *node) {
     return node->hostname;
 }
 
-long long getReplOffset(clusterNode *node) {
+long long clusterNodeReplOffset(clusterNode *node) {
     return node->repl_offset;
 }
 
-const char *getPreferredEndpoint(clusterNode *n) {
+const char *clusterNodePreferredEndpoint(clusterNode *n) {
     char *hostname = clusterNodeHostname(n);
     switch (server.cluster_preferred_endpoint_type) {
         case CLUSTER_ENDPOINT_TYPE_IP:
diff --git a/src/debug.c b/src/debug.c
index b6ed93a79..2758e2b18 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -498,7 +498,7 @@ void debugCommand(client *c) {
 "    Enable or disable the reply buffer resize cron job",
 NULL
         };
-        addExtendedReplyHelp(c, help, clusterDebugCommandHelp());
+        addExtendedReplyHelp(c, help, clusterDebugCommandExtendedHelp());
     } else if (!strcasecmp(c->argv[1]->ptr,"segfault")) {
         /* Compiler gives warnings about writing to a random address
          * e.g "*((char*)-1) = 'x';". As a workaround, we map a read-only area
diff --git a/src/module.c b/src/module.c
index 5a813fb5c..b33192e08 100644
--- a/src/module.c
+++ b/src/module.c
@@ -8990,7 +8990,7 @@ int RM_GetClusterNodeInfo(RedisModuleCtx *ctx, const char *id, char *ip, char *m
     if (flags) {
         *flags = 0;
         if (clusterNodeIsMyself(node)) *flags |= REDISMODULE_NODE_MYSELF;
-        if (nodeIsMaster(node)) *flags |= REDISMODULE_NODE_MASTER;
+        if (clusterNodeIsMaster(node)) *flags |= REDISMODULE_NODE_MASTER;
         if (clusterNodeIsSlave(node)) *flags |= REDISMODULE_NODE_SLAVE;
         if (clusterNodeTimedOut(node)) *flags |= REDISMODULE_NODE_PFAIL;
         if (clusterNodeIsFailing(node)) *flags |= REDISMODULE_NODE_FAIL;
diff --git a/src/server.c b/src/server.c
index 327675690..454bd969d 100644
--- a/src/server.c
+++ b/src/server.c
@@ -6838,7 +6838,7 @@ int redisIsSupervised(int mode) {
 
 int iAmMaster(void) {
     return ((!server.cluster_enabled && server.masterhost == NULL) ||
-            (server.cluster_enabled && nodeIsMaster(getMyClusterNode())));
+            (server.cluster_enabled && clusterNodeIsMaster(getMyClusterNode())));
 }
 
 #ifdef REDIS_TEST
@@ -7161,7 +7161,7 @@ int main(int argc, char **argv) {
     ACLLoadUsersAtStartup();
     initListeners();
     if (server.cluster_enabled) {
-        clusterInitListeners();
+        clusterInitLast();
     }
     InitServerLast();