diff --git a/src/common/slurm_protocol_errno.c b/src/common/slurm_protocol_errno.c
index 1c5baf94118bb379c6fbed9d4cb0e5d367b30208..aa82c79c9439cda66bf2cdf695d839db643862e1 100644
--- a/src/common/slurm_protocol_errno.c
+++ b/src/common/slurm_protocol_errno.c
@@ -42,18 +42,11 @@ static slurm_errtab_t slurm_errtab[] = {
 	{ ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE, "Requested node configuration is not available" },
 	{ ESLURM_NODES_BUSY,			"Requested nodes are busy" },
 	{ ESLURM_INVALID_JOB_ID,		"Invalid job id specified" },
-	{ ESLURM_INVALID_NODE_NAMES,		"Invalid node name specified" },
+	{ ESLURM_INVALID_NODE_NAME,		"Invalid node name specified" },
 	{ ESLURM_INVALID_PARTITION_NAME,	"Invalid partition name specified" },
-	{ fBESLURM_TRANSITION_STATE_NO_UPDATE,	"Job can not be altered now, try again later" },
+	{ ESLURM_TRANSITION_STATE_NO_UPDATE,	"Job can not be altered now, try again later" },
 	{ ESLURM_ALREADY_DONE,			"Job/step already completed" },
 
-	/* partition_mgr.c/update_part */
-	{ ESLURM_INVALID_NODE_NAME_SPECIFIED, 	"Invalid node name specified" },
-
-	/* node_mgr.c/update_node */
-	{ ESLURM_INVALID_NODE_NAME,		"Invalid node name specified" },
-
-	/* step_mgr.c */
 	{ ESLURM_ACCESS_DENIED,			"Access denied" }
 };
 
diff --git a/src/common/slurm_protocol_errno.h b/src/common/slurm_protocol_errno.h
index dc44d1e291b435348728d093de9d891c7763b1a6..f2138bcf72f70ff1f6e93d770352747784af87ea 100644
--- a/src/common/slurm_protocol_errno.h
+++ b/src/common/slurm_protocol_errno.h
@@ -38,20 +38,20 @@
 #define ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE	-2015
 #define ESLURM_NODES_BUSY				-2016
 #define ESLURM_INVALID_JOB_ID				-2017
-#define ESLURM_INVALID_NODE_NAMES			-2018
+#define ESLURM_INVALID_NODE_NAME			-2018
 #define ESLURM_INVALID_PARTITION_NAME			-2019
-#define fBESLURM_TRANSITION_STATE_NO_UPDATE		-2020
+#define ESLURM_TRANSITION_STATE_NO_UPDATE		-2020
 #define ESLURM_ALREADY_DONE				-2021
 
 /* partition_mgr.c/update_part */
-#define ESLURM_INVALID_NODE_NAME_SPECIFIED		-2101
+/* already defined above ESLURM_INVALID_NODE_NAME	-2018 */
 
 /* node_mgr.c/update_node */
-#define ESLURM_INVALID_NODE_NAME			-2201
+/* already defined above ESLURM_INVALID_NODE_NAME	-2018 */
 #define ESLURM_ACCESS_DENIED				-2202
 
 /* step_mgr.c */
-/* already defined above #define ESLURM_ACCESS_DENIED				-2301 */
+/* already defined above ESLURM_ACCESS_DENIED		-2202 */
 
 /* look up an errno value */
 extern char * slurm_strerror(int errnum);
@@ -59,7 +59,7 @@ extern char * slurm_strerror(int errnum);
 /* set an errno value */
 extern void slurm_seterrno(int errnum);
 
-/* set an errno value */
+/* get an errno value */
 extern inline int slurm_get_errno();
 
 /* print message: error string for current errno value */
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 01250068a9d30fd923f63cc24cab0dda238904bb..7ad2690e45a3a3a4a71aea2322c306fabd122296 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -464,7 +464,7 @@ job_cancel (uint32_t job_id)
 
 	info ("job_cancel: job %u can't be cancelled from state=%s", 
 			job_id, job_state_string(job_ptr->job_state));
-	return fBESLURM_TRANSITION_STATE_NO_UPDATE;
+	return ESLURM_TRANSITION_STATE_NO_UPDATE;
 
 }
 
@@ -708,7 +708,7 @@ job_step_cancel (uint32_t job_id, uint32_t step_id)
 
 	info ("job_step_cancel: step %u.%u can't be cancelled from state=%s", 
 			job_id, step_id, job_state_string(job_ptr->job_state));
-	return fBESLURM_TRANSITION_STATE_NO_UPDATE;
+	return ESLURM_TRANSITION_STATE_NO_UPDATE;
 
 }
 
@@ -1304,7 +1304,7 @@ update_job (job_desc_msg_t * job_specs)
 		if (error_code == EINVAL) {
 			if ( req_bitmap )
 				bit_free (req_bitmap);
-			return ESLURM_INVALID_NODE_NAMES;
+			return ESLURM_INVALID_NODE_NAME;
 		}
 
 		if (detail_ptr -> req_nodes)
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 8124ca5d277a6b4b84690fa1d0c9146446bea2b3..f60216bf77a9f682115bc954f8a8fbdef2c4c6ac 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -206,7 +206,7 @@ int build_part_bitmap (struct part_record *part_record_point)
 			bit_free (old_bitmap);
 		error ("build_part_bitmap: invalid node specified %s", 
 			part_record_point->nodes);
-		return ESLURM_INVALID_NODE_NAME_SPECIFIED;
+		return ESLURM_INVALID_NODE_NAME;
 	}
 
 	for (i = 0; i < node_count; i++) {
@@ -217,7 +217,7 @@ int build_part_bitmap (struct part_record *part_record_point)
 			if (old_bitmap)
 				bit_free (old_bitmap);
 			xfree(node_list);
-			return ESLURM_INVALID_NODE_NAME_SPECIFIED;
+			return ESLURM_INVALID_NODE_NAME;
 		}	
 		part_record_point->total_nodes++;
 		part_record_point->total_cpus += node_record_point->cpus;