diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index cee95792ead..b731724ae0c 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -328,7 +328,7 @@ struct ctdb_context {
 
 	struct ctdb_reloadips_handle *reload_ips;
 
-	const char *nodes_file;
+	const char *nodes_source;
 	const char *public_addresses_file;
 	struct trbt_tree *child_processes; 
 
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 97dfc80ffd1..287a76c77c3 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -2193,7 +2193,7 @@ int ctdb_control_getnodesfile(struct ctdb_context *ctdb,
 
 	CHECK_CONTROL_DATA_SIZE(0);
 
-	node_map = ctdb_read_nodes(ctdb, ctdb->nodes_file);
+	node_map = ctdb_read_nodes(ctdb, ctdb->nodes_source);
 	if (node_map == NULL) {
 		D_ERR("Failed to read nodes file\n");
 		return -1;
diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c
index b7a33af7ecf..dbb7972e890 100644
--- a/ctdb/server/ctdb_server.c
+++ b/ctdb/server/ctdb_server.c
@@ -127,7 +127,7 @@ void ctdb_load_nodes_file(struct ctdb_context *ctdb)
 	struct ctdb_node_map *node_map;
 	int ret;
 
-	node_map = ctdb_read_nodes(ctdb, ctdb->nodes_file);
+	node_map = ctdb_read_nodes(ctdb, ctdb->nodes_source);
 	if (node_map == NULL) {
 		goto fail;
 	}
@@ -143,8 +143,8 @@ void ctdb_load_nodes_file(struct ctdb_context *ctdb)
 	return;
 
 fail:
-	DEBUG(DEBUG_ERR, ("Failed to load nodes file \"%s\"\n",
-			  ctdb->nodes_file));
+	DEBUG(DEBUG_ERR, ("Failed to load nodes \"%s\"\n",
+			  ctdb->nodes_source));
 	talloc_free(node_map);
 	exit(1);
 }
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 42695fff444..b8af340d843 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -304,8 +304,8 @@ int main(int argc, const char *argv[])
 	}
 
 	/* tell ctdb what nodes are available */
-	ctdb->nodes_file = cluster_conf_nodes_list(ctdb, conf);
-	if (ctdb->nodes_file == NULL) {
+	ctdb->nodes_source = cluster_conf_nodes_list(ctdb, conf);
+	if (ctdb->nodes_source == NULL) {
 		DBG_ERR(" Out of memory\n");
 		goto fail;
 	}