diff --git a/config.c b/config.c
index 50085131..8c6d50cf 100644
--- a/config.c
+++ b/config.c
@@ -37,7 +37,7 @@ parse_config(const char *config_file, t_configuration_options *options)
 	memset(options->conninfo, 0, sizeof(options->conninfo));
 	options->failover = MANUAL_FAILOVER;
 	options->priority = 0;
-	memset(options->standby_name, 0, sizeof(options->standby_name));
+	memset(options->node_name, 0, sizeof(options->node_name));
 	memset(options->promote_command, 0, sizeof(options->promote_command));
 	memset(options->follow_command, 0, sizeof(options->follow_command));
 	memset(options->rsync_options, 0, sizeof(options->rsync_options));
@@ -92,8 +92,8 @@ parse_config(const char *config_file, t_configuration_options *options)
 		}
 		else if (strcmp(name, "priority") == 0)
 			options->priority = atoi(value);
-		else if (strcmp(name, "standby_name") == 0)
-			strncpy(options->standby_name, value, MAXLEN);
+		else if (strcmp(name, "node_name") == 0)
+			strncpy(options->node_name, value, MAXLEN);
 		else if (strcmp(name, "promote_command") == 0)
 			strncpy(options->promote_command, value, MAXLEN);
 		else if (strcmp(name, "follow_command") == 0)
@@ -203,7 +203,7 @@ reload_configuration(char *config_file, t_configuration_options *orig_options)
 		return false;
 	}
 
-	if (new_options.standby_name != orig_options->standby_name)
+	if (new_options.node_name != orig_options->node_name)
 	{
 		log_warning(_("\nCannot change standby name, will keep current configuration.\n"));
 		return false;
@@ -230,7 +230,7 @@ reload_configuration(char *config_file, t_configuration_options *orig_options)
 	strcpy(orig_options->conninfo, new_options.conninfo);
 	orig_options->failover = new_options.failover;
 	orig_options->priority = new_options.priority;
-	strcpy(orig_options->standby_name, new_options.standby_name);
+	strcpy(orig_options->node_name, new_options.node_name);
 	strcpy(orig_options->promote_command, new_options.promote_command);
 	strcpy(orig_options->follow_command, new_options.follow_command);
 	strcpy(orig_options->rsync_options, new_options.rsync_options);
diff --git a/config.h b/config.h
index e1ee6b3c..c3a379b5 100644
--- a/config.h
+++ b/config.h
@@ -30,7 +30,7 @@ typedef struct
 	char conninfo[MAXLEN];
 	int failover;
 	int priority;
-	char standby_name[MAXLEN];
+	char node_name[MAXLEN];
 	char promote_command[MAXLEN];
 	char follow_command[MAXLEN];
 	char loglevel[MAXLEN];
diff --git a/repmgr.c b/repmgr.c
index 3055a9ba..52bbe0fd 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -520,7 +520,7 @@ do_master_register(void)
 
 	sqlquery_snprintf(sqlquery, "INSERT INTO %s.repl_nodes (id, cluster, name, conninfo, priority) "
 	                  "VALUES (%d, '%s', '%s', %d)",
-	                  repmgr_schema, options.node, options.cluster_name, options.standby_name, 
+	                  repmgr_schema, options.node, options.cluster_name, options.node_name, 
                       options.conninfo, options.priority);
 	log_debug(_("master register: %s\n"), sqlquery);
 
@@ -663,7 +663,7 @@ do_standby_register(void)
 
 	sqlquery_snprintf(sqlquery, "INSERT INTO %s.repl_nodes(id, cluster, name, conninfo, priority) "
 	                  "VALUES (%d, '%s', '%s', %d)",
-	                  repmgr_schema, options.node, options.cluster_name, options.standby_name, 
+	                  repmgr_schema, options.node, options.cluster_name, options.node_name, 
                       options.conninfo, options.priority);
 	log_debug(_("standby register: %s\n"), sqlquery);
 
@@ -2092,8 +2092,8 @@ write_primary_conninfo(char* line)
 		maxlen_snprintf(user_buf, " user=%s", runtime_options.username);
 	}
 
-	if (options.standby_name[0]) {
-		maxlen_snprintf(appname_buff, " application_name=%s", options.standby_name);
+	if (options.node_name[0]) {
+		maxlen_snprintf(appname_buff, " application_name=%s", options.node_name);
 	}
 
 	maxlen_snprintf(conn_buf, "port=%s%s%s%s%s",
diff --git a/repmgr.conf.sample b/repmgr.conf.sample
index c9bdaee6..cedf1baf 100644
--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -7,7 +7,7 @@ cluster=test
 
 # Node ID
 node=2
-standby_name=standby2
+node_name=standby2
 
 # Connection information
 conninfo='host=192.168.204.104'
diff --git a/repmgrd.c b/repmgrd.c
index fafa0396..1a50c8a2 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -861,7 +861,7 @@ checkNodeConfiguration(char *conninfo)
 		                  "VALUES (%d, '%s', '%s', '%s', 0, 'f')",
 		                  repmgr_schema, local_options.node,
 		                  local_options.cluster_name,
-						  local_options.standby_name,
+						  local_options.node_name,
 		                  local_options.conninfo);
 
 		if (!PQexec(primaryConn, sqlquery))