diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c
index fc24139535de6dc19ec05bd685375bf5ec3caf9e..6b9d04b55a1195d1a2467f07640e88a09f670304 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.c
@@ -1462,19 +1462,22 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
 				       "%u on %s",
 				       test_only, job_ptr->job_id, starttime,
 				       bg_record->nodes);
-				select_g_select_jobinfo_set(job_ptr->select_jobinfo,
-					     SELECT_JOBDATA_BLOCK_ID,
-					     "unassigned");
+				select_g_select_jobinfo_set(
+					job_ptr->select_jobinfo,
+					SELECT_JOBDATA_BLOCK_ID,
+					"unassigned");
 
 				min_nodes = bg_record->node_cnt;
-				select_g_select_jobinfo_set(job_ptr->select_jobinfo,
-					     SELECT_JOBDATA_NODE_CNT,
-					     &min_nodes);
+				select_g_select_jobinfo_set(
+					job_ptr->select_jobinfo,
+					SELECT_JOBDATA_NODE_CNT,
+					&min_nodes);
 				memset(geo, 0, 
 				       sizeof(uint16_t) * BA_SYSTEM_DIMENSIONS);
-				select_g_select_jobinfo_set(job_ptr->select_jobinfo,
-						     SELECT_JOBDATA_GEOMETRY, 
-						     &geo);
+				select_g_select_jobinfo_set(
+					job_ptr->select_jobinfo,
+					SELECT_JOBDATA_GEOMETRY, 
+					&geo);
 				/* This is a fake record so we need to
 				 * destroy it after we get the info from
 				 * it */
diff --git a/src/plugins/select/bluegene/plugin/bg_job_run.c b/src/plugins/select/bluegene/plugin/bg_job_run.c
index 56d58dcf1b48783c885f22ec9635568da8e16f95..2d3cff7fb13e28c909e1dccc657077f6d7a0883a 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_run.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_run.c
@@ -1076,11 +1076,11 @@ extern int start_job(struct job_record *job_ptr)
 				    SELECT_JOBDATA_BLOCK_ID, 
 				    &(bg_update_ptr->bg_block_id));
 	select_g_select_jobinfo_get(job_ptr->select_jobinfo,
-				    SELECT_DATA_REBOOT, 
+				    SELECT_JOBDATA_REBOOT, 
 				    &(bg_update_ptr->reboot));
 #ifdef HAVE_BGL
 	select_g_selectt_jobinfo_get(job_ptr->select_jobinfo,
-				     SELECT_DATA_BLRTS_IMAGE, 
+				     SELECT_JOBDATA_BLRTS_IMAGE, 
 				     &(bg_update_ptr->blrtsimage));
 	if(!bg_update_ptr->blrtsimage) {
 		bg_update_ptr->blrtsimage =
@@ -1222,7 +1222,7 @@ extern int sync_jobs(List job_list)
 
 			select_g_select_jobinfo_get(
 				job_ptr->select_jobinfo,
-				SELECT_DATA_BLOCK_ID, 
+				SELECT_JOBDATA_BLOCK_ID, 
 				&(bg_update_ptr->bg_block_id));
 #ifdef HAVE_BGL
 			select_g_select_jobinfo_get(
@@ -1232,7 +1232,7 @@ extern int sync_jobs(List job_list)
 #else
 			select_g_select_jobinfo_get(
 				job_ptr->select_jobinfo,
-				SELECT_DATA_CONN_TYPE, 
+				SELECT_JOBDATA_CONN_TYPE, 
 				&(bg_update_ptr->conn_type));
 #endif
 			select_g_select_jobinfo_get(