diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index ec9267edbfc..23d8d9d320e 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -809,7 +809,7 @@ int ctdb_client_send_message(struct ctdb_context *ctdb, uint32_t vnn,
 /*
   send a ctdb message
 */
-int ctdb_daemon_send_message(struct ctdb_context *ctdb, uint32_t vnn,
+int ctdb_daemon_send_message(struct ctdb_context *ctdb, uint32_t pnn,
 			     uint64_t srvid, TDB_DATA data);
 
 
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 2c146c4795b..d831e019b5c 100644
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -393,7 +393,7 @@ void ctdb_reply_control(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 
 	state = ctdb_reqid_find(ctdb, hdr->reqid, struct ctdb_control_state);
 	if (state == NULL) {
-		DEBUG(0,("vnn %u Invalid reqid %u in ctdb_reply_control\n",
+		DEBUG(0,("pnn %u Invalid reqid %u in ctdb_reply_control\n",
 			 ctdb->pnn, hdr->reqid));
 		return;
 	}
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 595aafdf90f..ce355a5d377 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -44,7 +44,7 @@ static void flag_change_handler(struct ctdb_context *ctdb, uint64_t srvid,
 	}
 
 	if (!ctdb_validate_pnn(ctdb, c->pnn)) {
-		DEBUG(0,("Bad vnn %u in flag_change_handler\n", c->pnn));
+		DEBUG(0,("Bad pnn %u in flag_change_handler\n", c->pnn));
 		return;
 	}
 
@@ -910,14 +910,14 @@ static int ctdb_local_message(struct ctdb_context *ctdb, uint64_t srvid, TDB_DAT
 /*
   send a ctdb message
 */
-int ctdb_daemon_send_message(struct ctdb_context *ctdb, uint32_t vnn,
+int ctdb_daemon_send_message(struct ctdb_context *ctdb, uint32_t pnn,
 			     uint64_t srvid, TDB_DATA data)
 {
 	struct ctdb_req_message *r;
 	int len;
 
 	/* see if this is a message to ourselves */
-	if (vnn == ctdb->pnn) {
+	if (pnn == ctdb->pnn) {
 		return ctdb_local_message(ctdb, srvid, data);
 	}
 
@@ -926,7 +926,7 @@ int ctdb_daemon_send_message(struct ctdb_context *ctdb, uint32_t vnn,
 				    struct ctdb_req_message);
 	CTDB_NO_MEMORY(ctdb, r);
 
-	r->hdr.destnode  = vnn;
+	r->hdr.destnode  = pnn;
 	r->srvid         = srvid;
 	r->datalen       = data.dsize;
 	memcpy(&r->data[0], data.dptr, data.dsize);