Index: trunk/Ohana/src/opihi/pantasks/CheckJobs.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/CheckJobs.c	(revision 12469)
+++ trunk/Ohana/src/opihi/pantasks/CheckJobs.c	(revision 12840)
@@ -48,6 +48,6 @@
 	/* push output buffer data to the stdout and stderr queues */
 	/* XXX this will break on 0 values in output streams */
-	PushNamedQueue ("stdout", job[0].stdout.buffer);
-	PushNamedQueue ("stderr", job[0].stderr.buffer);
+	PushNamedQueue ("stdout", job[0].stdout_buff.buffer);
+	PushNamedQueue ("stderr", job[0].stderr_buff.buffer);
 
 	/* save the stdout and stderr if desired */
@@ -57,5 +57,5 @@
 	    gprint (GP_ERR, "unable to open stdout dump file %s\n", job[0].stdout_dump);
 	  } else {
-	    fwrite (job[0].stdout.buffer, 1, job[0].stdout.Nbuffer, f);
+	    fwrite (job[0].stdout_buff.buffer, 1, job[0].stdout_buff.Nbuffer, f);
 	    fclose (f);
 	  }
@@ -66,5 +66,5 @@
 	    gprint (GP_ERR, "unable to open stderr dump file %s\n", job[0].stderr_dump);
 	  } else {
-	    fwrite (job[0].stderr.buffer, 1, job[0].stderr.Nbuffer, f);
+	    fwrite (job[0].stderr_buff.buffer, 1, job[0].stderr_buff.Nbuffer, f);
 	    fclose (f);
 	  }
Index: trunk/Ohana/src/opihi/pantasks/ControllerOps.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/ControllerOps.c	(revision 12469)
+++ trunk/Ohana/src/opihi/pantasks/ControllerOps.c	(revision 12840)
@@ -29,5 +29,5 @@
   if ((job[0].state == JOB_EXIT) || (job[0].state == JOB_CRASH)) {
     gettimeofday (&start, (void *) NULL);
-    GetJobOutput ("stdout", job[0].pid, &job[0].stdout, job[0].stdout_size);
+    GetJobOutput ("stdout", job[0].pid, &job[0].stdout_buff, job[0].stdout_size);
     gettimeofday (&stop, (void *) NULL);
     dtime = DTIME (stop, start);
@@ -35,5 +35,5 @@
 
     gettimeofday (&start, (void *) NULL);
-    GetJobOutput ("stderr", job[0].pid, &job[0].stderr, job[0].stderr_size);
+    GetJobOutput ("stderr", job[0].pid, &job[0].stderr_buff, job[0].stderr_size);
     gettimeofday (&stop, (void *) NULL);
     dtime = DTIME (stop, start);
Index: trunk/Ohana/src/opihi/pantasks/JobOps.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/JobOps.c	(revision 12469)
+++ trunk/Ohana/src/opihi/pantasks/JobOps.c	(revision 12840)
@@ -143,6 +143,6 @@
      need to have matched entries to these quantites in the job structure */
 
-  InitIOBuffer (&job[0].stdout, 0x100);
-  InitIOBuffer (&job[0].stderr, 0x100);
+  InitIOBuffer (&job[0].stdout_buff, 0x100);
+  InitIOBuffer (&job[0].stderr_buff, 0x100);
 
   job[0].stdout_dump = NULL;
@@ -181,6 +181,6 @@
   if (job[0].stderr_dump != NULL) free (job[0].stderr_dump);
 
-  FreeIOBuffer (&job[0].stdout);
-  FreeIOBuffer (&job[0].stderr);
+  FreeIOBuffer (&job[0].stdout_buff);
+  FreeIOBuffer (&job[0].stderr_buff);
   free (job);
   return;
Index: trunk/Ohana/src/opihi/pantasks/LocalJob.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/LocalJob.c	(revision 12469)
+++ trunk/Ohana/src/opihi/pantasks/LocalJob.c	(revision 12840)
@@ -15,11 +15,11 @@
 
   if ((job[0].state == JOB_EXIT) || (job[0].state == JOB_CRASH)) {
-    EmptyIOBuffer (&job[0].stdout, 10, job[0].stdout_fd);
-    EmptyIOBuffer (&job[0].stderr, 10, job[0].stderr_fd);
+    EmptyIOBuffer (&job[0].stdout_buff, 10, job[0].stdout_fd);
+    EmptyIOBuffer (&job[0].stderr_buff, 10, job[0].stderr_fd);
     close (job[0].stdout_fd);
     close (job[0].stderr_fd);
   } else {
     /* read stdout buffer */
-    Nread = ReadtoIOBuffer (&job[0].stdout, job[0].stdout_fd);
+    Nread = ReadtoIOBuffer (&job[0].stdout_buff, job[0].stdout_fd);
     switch (Nread) {
       case -2:  /* error in read (programming error?  system level error?) */
@@ -34,5 +34,5 @@
   
     /* read stderr buffer */
-    Nread = ReadtoIOBuffer (&job[0].stderr, job[0].stderr_fd);
+    Nread = ReadtoIOBuffer (&job[0].stderr_buff, job[0].stderr_fd);
     switch (Nread) {
       case -2:  /* error in read (programming error?  system level error?) */