diff --git a/doc/html/bluegene.shtml b/doc/html/bluegene.shtml
index c8676a43e42b6038c10f560e2653e52d330e8134..31569aba7ee72d63b4f536410d92fc7bebcc1cf4 100644
--- a/doc/html/bluegene.shtml
+++ b/doc/html/bluegene.shtml
@@ -481,7 +481,11 @@ Recreate, Remove, Resume.
 <p>Alternatively, if only part of a midplane needs to be put
 into an error state which isn't already in a block of the size you
 need, you can set a collection of IO nodes into an error state using
-<i>scontrol</i> (i.e. "<i>scontrol update submpname=bg000[0-3] state=error</i>").
+<i>scontrol</i> (i.e. "<i>scontrol update submpname=bg000[0-3]
+  state=error</i>").
+NOTE: Even on BGQ where node names are given in bg0000[00000] format
+this option takes an ionode name bg0000[0].
+
 This will end any job on the nodes listed, create a block there, and set
 the state of the block to ERROR making it so no job will run on the
 block.  Then resume the block when it is ready to be used again (i.e.
diff --git a/doc/man/man1/scontrol.1 b/doc/man/man1/scontrol.1
index 9ab1c9d10f0feef6a65c58d919d8a1f8c8492cf4..1a8bcfec20e620eadac6d9ea0db50f5858e6fb87 100644
--- a/doc/man/man1/scontrol.1
+++ b/doc/man/man1/scontrol.1
@@ -301,7 +301,7 @@ Display the state of the specified entity with the specified identification.
 \fIENTITY\fP may be \fIaliases\fP, \fIconfig\fP, \fIdaemons\fP, \fIfrontend\fP,
 \fIjob\fP, \fInode\fP, \fIpartition\fP, \fIreservation\fP, \fIslurmd\fP,
 \fIstep\fP, \fItopology\fP, \fIhostlist\fP or \fIhostnames\fP
-(also \fIblock\fP or \fIsubbp\fP on BlueGene systems).
+(also \fIblock\fP or \fIsubmp\fP on BlueGene systems).
 \fIID\fP can be used to identify a specific element of the identified
 entity: the configuration parameter name, job ID, node name, partition name,
 reservation name, or job step ID for \fIconfig\fP, \fIjob\fP, \fInode\fP,
@@ -1200,9 +1200,11 @@ running job on the block!  On dynamically laid out systems REMOVE will
 free and remove the block from the system.  If the block is smaller
 than a midplane every block on that midplane will be removed.
 .TP
-\fISubBPName\fP=<name>
+\fISubMPName\fP=<name>
 Identify the bluegene ionodes to be updated (i.e. bg000[0\-3]). This
 specification is required.
+NOTE: Even on BGQ where node names are given in bg0000[00000] format
+this option takes an ionode name bg0000[0].
 .TP
 
 .SH "ENVIRONMENT VARIABLES"