diff --git a/doc/html/news.shtml b/doc/html/news.shtml
index 2b16205ed091d566b1dfc3a56cfe6c1293253038..5c301925fa39c28f9fb93ebf5fc5abd71783ce3f 100644
--- a/doc/html/news.shtml
+++ b/doc/html/news.shtml
@@ -82,7 +82,7 @@ on a node.</li>
<li>Permit batch jobs to be requeued.</li>
<li>Expanded support of Moab and Maui schedulers.</li>
<li><i>Srun</i> command augmented by new commands for each operation:
-<i>salloc</i>, <i>slaunch</i>, <i>sbatch</i>, and <i>sattach</i>.</li>
+<i>salloc</i>, <i>sbatch</i>, and <i>sattach</i>.</li>
<li>Sched/wiki plugin (for Moab and Maui Schedulers) rewritten to
provide vastly improved integration.</li>
<li>BlueGene plugin permits use of different boot images per job
diff --git a/doc/html/programmer_guide.shtml b/doc/html/programmer_guide.shtml
index 5764769fac3cec3f0366826b4fa55f49342112e5..aca25fcc132b628729a2f0c8bc5baba3291d3954 100644
--- a/doc/html/programmer_guide.shtml
+++ b/doc/html/programmer_guide.shtml
@@ -117,7 +117,6 @@ with an existing SLURM job.<br>
<b>scancel</b>—User command to cancel (or signal) a job or job step.<br>
<b>scontrol</b>—Administrator tool to manage SLURM.<br>
<b>sinfo</b>—User command to get information on SLURM nodes and partitions.<br>
-<b>slaunch</b>—User command to launch tasks within an existing job allocateion.<br>
<b>slurmctld</b>—SLURM central manager daemon code.<br>
<b>slurmd</b>—SLURM daemon code to manage the compute server nodes including
the execution of user applications.<br>
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index 21abf4b75dc736744a85997696767fd7e1095242..56b3440ebb8761ae5229db5e0d313e72fda72dd5 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -9,7 +9,7 @@ salloc [\fIoptions\fP] <\fIcommand\fP> [\fIcommand args\fR]
.LP
salloc is used to allocate a SLURM job allocation, which is a set of resources (nodes), possibly with some set of constraints (e.g. number of processors per node). When salloc successfully obtains the requested allocation, it then runs the command specified by the user. Finally, when the user specified command is complete, salloc relinquishes the job allocation.
-The command may be any program the user wishes. Some typical commands are xterm, a shell script containing slaunch commands, and slaunch (see the EXAMPLES section).
+The command may be any program the user wishes. Some typical commands are xterm, a shell script containing srun commands, and srun (see the EXAMPLES section).
.SH "OPTIONS"
.LP
@@ -422,7 +422,7 @@ While salloc is waiting for a PENDING job allocation, most signals will cause sa
However, if the allocation has been granted and salloc has already started the command speficied in its command line parameters salloc will ignore most signals. salloc will not exit or release the allocation until the command exits. The noteable exception is SIGHUP; a HUP signal will cause salloc to release the allocation and exit without waiting for the command to finish.
.SH "EXAMPLES"
.LP
-To get an allocation, and open a new xterm in which slaunch commands may be typed interactively:
+To get an allocation, and open a new xterm in which srun commands may be typed interactively:
.IP
$ salloc \-N16 xterm
.br
@@ -434,7 +434,7 @@ salloc: Relinquishing job allocation 65537
.LP
To grab an allocation of nodes and launch a parallel application on one command line (See the \fBsalloc\fR man page for more examples):
.IP
-salloc \-N5 slaunch \-n10 myprogram
+salloc \-N5 srun \-n10 myprogram
.SH "COPYING"
Copyright (C) 2006 The Regents of the University of California.
@@ -456,4 +456,4 @@ details.
.SH "SEE ALSO"
.LP
-sinfo(1), slaunch(1), sattach(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+sinfo(1), sattach(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
diff --git a/doc/man/man1/sattach.1 b/doc/man/man1/sattach.1
index b3a495aecb8dbd3fd6a47b47f28f93327ae91cc1..2509133bc418d3403dfccc8267c162de745600dc 100644
--- a/doc/man/man1/sattach.1
+++ b/doc/man/man1/sattach.1
@@ -45,7 +45,7 @@ Suppress informational messages from sattach. Errors will still be displayed.
.TP
\fB\-v\fR, \fB\-\-verbose\fR
Increase the verbosity of sattach's informational messages. Multiple \-v's
-will further increase slaunch's verbosity.
+will further increase sattach's verbosity.
.TP
\fB\-h\fR, \fB\-\-help\fR
@@ -86,4 +86,4 @@ details.
.SH "SEE ALSO"
.LP
-sinfo(1), slaunch(1), salloc(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+sinfo(1), salloc(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index 231dc70a44aa1d7a3eaa555781232e8c5b19a67c..5d3c2dc58961d5878881ccee75ef281240a5d778 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -461,7 +461,7 @@ $ cat myscript
.br
#!/bin/sh
.br
-slaunch hostname |sort
+srun hostname |sort
.br
$ sbatch \-N4 myscript
.br
@@ -484,7 +484,7 @@ morrone:~$ sbatch \-N4 <<EOF
.br
> #!/bin/sh
.br
-> slaunch hostname |sort
+> srun hostname |sort
.br
> EOF
.br
@@ -520,4 +520,4 @@ details.
.SH "SEE ALSO"
.LP
-sinfo(1), slaunch(1), sattach(1), salloc(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+sinfo(1), sattach(1), salloc(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
diff --git a/doc/man/man1/slurm.1 b/doc/man/man1/slurm.1
index 05e6bee0c415108e70e61c6f7d1e77377b8e0396..405929b967889104c133ee1a1b03cecd350557e4 100644
--- a/doc/man/man1/slurm.1
+++ b/doc/man/man1/slurm.1
@@ -55,7 +55,7 @@ details.
.SH "SEE ALSO"
\fBsacct\fR(1), \fBsalloc\fR(1), \fBsattach\fR(1), \fBsbatch\fR(1),
\fBsbcast\fR(1), \fBscancel\fR(1), \fBscontrol\fR(1), \fBsinfo\fR(1),
-\fBslaunch\fR(1), \fBsmap\fR(1), \fBsqueue\fR(1), \fBsrun\fR(1),
+\fBsmap\fR(1), \fBsqueue\fR(1), \fBsrun\fR(1),
\fBsview\fR(1),
\fBslurm.conf\fR(5),
\fBslurmctld\fR(8), \fBslurmd\fR(8)
diff --git a/src/api/step_launch.h b/src/api/step_launch.h
index 6cd7dfe34528ae6f2fbe82e260e40779692bb7e2..695619fdfe77441fd79394ea16018a1cdbb3f817 100644
--- a/src/api/step_launch.h
+++ b/src/api/step_launch.h
@@ -61,7 +61,8 @@ struct step_launch_state {
/* message thread variables */
eio_handle_t *msg_handle;
pthread_t msg_thread;
- /* set to -1 if slaunch message handler should not attempt to handle */
+ /* set to -1 if step launch message handler should not attempt
+ to handle */
int slurmctld_socket_fd;
uint16_t num_resp_port;
uint16_t *resp_port; /* array of message response ports */
diff --git a/src/common/env.c b/src/common/env.c
index e3688c63de7a6e6283a807bf4b21e34dbff5e9e3..c60a3fd283c636df9603217aa31b3a8c6414d92a 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -621,7 +621,7 @@ int setup_env(env_t *env)
/**********************************************************************
* From here on are the new environment variable management functions,
- * used by the "new" commands: salloc, sbatch, an slaunch.
+ * used by the "new" commands: salloc, sbatch, and the step launch APIs.
**********************************************************************/
/*
diff --git a/src/sattach/sattach.c b/src/sattach/sattach.c
index 55cc500b582a4f8f501e5978456b61dc217c1f59..468b6f65fe3ab35d422cd2e5dc0a6ebeddfe1b0e 100644
--- a/src/sattach/sattach.c
+++ b/src/sattach/sattach.c
@@ -600,7 +600,7 @@ _handle_msg(message_thread_state_t *mts, slurm_msg_t *msg)
/**********************************************************************
* Functions for manipulating the MPIR_* global variables which
- * are accessed by parallel debuggers which trace slaunch.
+ * are accessed by parallel debuggers which trace sattach.
**********************************************************************/
static void
_mpir_init(int num_tasks)