diff --git a/doc/html/faq.shtml b/doc/html/faq.shtml
index 9201b4d8de047e10da9a634e939642e4ae01198f..d901a1ed3da837980f1c5743e97712c8d0e212be 100644
--- a/doc/html/faq.shtml
+++ b/doc/html/faq.shtml
@@ -1307,7 +1307,7 @@ to relocate them. In order to do so, follow this procedure:</p>
 make sure the permissions allow the <i>SlurmUser</i> to read and write it.
 <li>Restart all Slurm daemons</li>
 </ol>
-<p>There should be no loss of any running or pending jobs. Insure that
+<p>There should be no loss of any running or pending jobs. Ensure that
 any nodes added to the cluster have a current <i>slurm.conf</i> file
 installed.
 <b>CAUTION:</b> If two nodes are simultaneously configured as the primary
diff --git a/doc/html/power_save.shtml b/doc/html/power_save.shtml
index 51bc41539b3257a7571446d61d7ddffebacf6d33..3fa5f9a60a7d206b7d193f1ddfb0b9c63ecfe2d1 100644
--- a/doc/html/power_save.shtml
+++ b/doc/html/power_save.shtml
@@ -205,7 +205,7 @@ command "<i>scontrol wait_job $SLURM_JOB_ID</i>" within the script or by
 adding that command to the system <i>Prolog</i> or <i>PrologSlurmctld</i>
 as configured in <i>slurm.conf</i>, which would create the delay for all jobs
 on the system.
-Insure that the <i>Prolog</i> code is zero to avoid draining the node
+Ensure that the <i>Prolog</i> code is zero to avoid draining the node
 (do not use the scontrol exit code to avoid draining the node on error,
 for example if the job is explicitly cancelled during startup).</p>
 
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 1d0289a138cf22b07eff21bfe8c79adef23cf49c..5bd840fb3763d99eb657439d32754e2d4eaad59e 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -905,7 +905,7 @@ A comma delimited list of generic resources to be managed.
 These generic resources may have an associated plugin available to provide
 additional functionality.
 No generic resources are managed by default.
-Insure this parameter is consistent across all nodes in the cluster for
+Ensure this parameter is consistent across all nodes in the cluster for
 proper operation.
 The slurmctld daemon must be restarted for changes to this parameter to become
 effective.
@@ -5188,7 +5188,7 @@ In order to do so, follow this procedure:
 4. Restart the Slurm daemons
 .LP
 There should be no loss of any running or pending jobs.
-Insure that any nodes added to the cluster have the current
+Ensure that any nodes added to the cluster have the current
 slurm.conf file installed.
 .LP
 \fBCAUTION:\fR If two nodes are simultaneously configured as the
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index b8624859689fb62ac6dfdff6accd4142167ab9ec..7c0fb018bbed1d9fddccb1dba955413a1df0b816 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -1016,7 +1016,7 @@ enum ctx_keys {
 
 #define PROP_PRIO_OFF		0x0000	/* Do not propagage user nice value */
 #define PROP_PRIO_ON		0x0001	/* Propagate user nice value */
-#define PROP_PRIO_NICER		0x0002	/* Insure that user tasks have a nice
+#define PROP_PRIO_NICER		0x0002	/* Ensure that user tasks have a nice
 					 * value that is higher than slurmd */
 
 #define PRIORITY_FLAGS_ACCRUE_ALWAYS	0x0001	/* Flag to always accrue age
diff --git a/src/common/bitstring.c b/src/common/bitstring.c
index 536099eb96e8610c4d6d4554ef966ecbca26d498..0054f232c89d32e6fff0b95fabfb323badb05c17 100644
--- a/src/common/bitstring.c
+++ b/src/common/bitstring.c
@@ -90,7 +90,7 @@
 } while (0)
 
 
-/* Insure valid bitmap size, prevent overflow in buffer size calcuation */
+/* Ensure valid bitmap size, prevent overflow in buffer size calcuation */
 #define _assert_valid_size(bit) do {	\
 	assert((bit) >= 0);		\
 	assert((bit) <= 0x40000000); 	\
diff --git a/src/common/gres.c b/src/common/gres.c
index 22ca3ff9396715ea8ef39f428630d75b1cfce0e0..d1e746c50389949f46d0f186090f79dd0ba4cc13 100644
--- a/src/common/gres.c
+++ b/src/common/gres.c
@@ -467,7 +467,7 @@ extern int gres_plugin_init(void)
 	}
 	xfree(names);
 
-	/* Insure that plugin_id is valid and unique */
+	/* Ensure that plugin_id is valid and unique */
 	for (i=0; i<gres_context_cnt; i++) {
 		for (j=i+1; j<gres_context_cnt; j++) {
 			if (gres_context[i].plugin_id !=
diff --git a/src/common/node_select.c b/src/common/node_select.c
index 8f04312157f74de095247ef422324366699b56e2..629eab4f4db312045423b77e542ae140156087e0 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -303,7 +303,7 @@ extern int slurm_select_init(bool only_default)
 	if (select_context_default == -1)
 		fatal("Can't find plugin for %s", select_type);
 
-	/* Insure that plugin_id is valid and unique */
+	/* Ensure that plugin_id is valid and unique */
 	for (i=0; i<select_context_cnt; i++) {
 		for (j=i+1; j<select_context_cnt; j++) {
 			if (*(ops[i].plugin_id) !=
diff --git a/src/common/switch.c b/src/common/switch.c
index cd69d7a1337e876a5315e1ec74eba44c88ad043e..ae375679afeff5b6967e508a3ad60b58a22dd51b 100644
--- a/src/common/switch.c
+++ b/src/common/switch.c
@@ -266,7 +266,7 @@ extern int switch_init(bool only_default)
 	if (switch_context_default == -1)
 		fatal("Can't find plugin for %s", switch_type);
 
-	/* Insure that plugin_id is valid and unique */
+	/* Ensure that plugin_id is valid and unique */
 	for (i = 0; i < switch_context_cnt; i++) {
 		for (j = i+1; j < switch_context_cnt; j++) {
 			if (*(ops[i].plugin_id) !=
diff --git a/src/database/mysql_common.c b/src/database/mysql_common.c
index e8b06db497542f4c4a0d79b7ef4199639ded7c93..8ae560bebaf1a31bf92c18fba029b2ea0deab17c 100644
--- a/src/database/mysql_common.c
+++ b/src/database/mysql_common.c
@@ -66,7 +66,7 @@ static void _destroy_db_key(void *arg)
 	}
 }
 
-/* NOTE: Insure that mysql_conn->lock is set on function entry */
+/* NOTE: Ensure that mysql_conn->lock is set on function entry */
 static int _clear_results(MYSQL *db_conn)
 {
 	MYSQL_RES *result = NULL;
@@ -91,7 +91,7 @@ static int _clear_results(MYSQL *db_conn)
 	return SLURM_SUCCESS;
 }
 
-/* NOTE: Insure that mysql_conn->lock is set on function entry */
+/* NOTE: Ensure that mysql_conn->lock is set on function entry */
 static MYSQL_RES *_get_first_result(MYSQL *db_conn)
 {
 	MYSQL_RES *result = NULL;
@@ -110,7 +110,7 @@ static MYSQL_RES *_get_first_result(MYSQL *db_conn)
 	return NULL;
 }
 
-/* NOTE: Insure that mysql_conn->lock is set on function entry */
+/* NOTE: Ensure that mysql_conn->lock is set on function entry */
 static MYSQL_RES *_get_last_result(MYSQL *db_conn)
 {
 	MYSQL_RES *result = NULL;
@@ -131,7 +131,7 @@ static MYSQL_RES *_get_last_result(MYSQL *db_conn)
 	return last_result;
 }
 
-/* NOTE: Insure that mysql_conn->lock is set on function entry */
+/* NOTE: Ensure that mysql_conn->lock is set on function entry */
 static int _mysql_query_internal(MYSQL *db_conn, char *query)
 {
 	int rc = SLURM_SUCCESS;
@@ -181,7 +181,7 @@ end_it:
 	return rc;
 }
 
-/* NOTE: Insure that mysql_conn->lock is NOT set on function entry */
+/* NOTE: Ensure that mysql_conn->lock is NOT set on function entry */
 static int _mysql_make_table_current(mysql_conn_t *mysql_conn, char *table_name,
 				     storage_field_t *fields, char *ending)
 {
@@ -539,7 +539,7 @@ static int _mysql_make_table_current(mysql_conn_t *mysql_conn, char *table_name,
 	return SLURM_SUCCESS;
 }
 
-/* NOTE: Insure that mysql_conn->lock is set on function entry */
+/* NOTE: Ensure that mysql_conn->lock is set on function entry */
 static int _create_db(char *db_name, mysql_db_info_t *db_info)
 {
 	char create_line[50];
diff --git a/src/plugins/select/bluegene/bg_job_place.c b/src/plugins/select/bluegene/bg_job_place.c
index e0a88a4195cb8110767331da1a4035b49750d785..caed29935b0eb5d7b6de7d1d81d726c357a36e8a 100644
--- a/src/plugins/select/bluegene/bg_job_place.c
+++ b/src/plugins/select/bluegene/bg_job_place.c
@@ -516,7 +516,7 @@ static bg_record_t *_find_matching_block(List block_list,
 		}
 
 		/*
-		 * Insure that any required nodes are in this BG block
+		 * Ensure that any required nodes are in this BG block
 		 */
 		if (job_ptr->details->req_node_bitmap
 		    && (!bit_super_set(job_ptr->details->req_node_bitmap,
diff --git a/src/plugins/select/bluegene/bg_job_run.c b/src/plugins/select/bluegene/bg_job_run.c
index 1c3f9702aedc56551bd62d73a141f7806d0b720a..bc365ba4a177a6720dc131702ccb6e1f13a1a9d6 100644
--- a/src/plugins/select/bluegene/bg_job_run.c
+++ b/src/plugins/select/bluegene/bg_job_run.c
@@ -785,7 +785,7 @@ extern int start_job(struct job_record *job_ptr)
  * RET - SLURM_SUCCESS or an error code
  *
  * NOTE: This happens in parallel with srun and slurmd terminating
- * the job. Insure that this function, mpirun and the epilog can
+ * the job. Ensure that this function, mpirun and the epilog can
  * all deal with termination race conditions.
  */
 int term_job(struct job_record *job_ptr)
@@ -830,7 +830,7 @@ extern int sync_jobs(List job_list)
 		return SLURM_ERROR;
 	}
 	slurm_mutex_lock(&block_state_mutex);
-	/* Insure that all running jobs own the specified block */
+	/* Ensure that all running jobs own the specified block */
 	itr = list_iterator_create(job_list);
 	while ((job_ptr = list_next(itr))) {
 		bg_action_t *bg_action_ptr = NULL;
@@ -920,7 +920,7 @@ extern int sync_jobs(List job_list)
 		FREE_NULL_LIST(kill_list);
 	}
 
-	/* Insure that all other blocks are free of users */
+	/* Ensure that all other blocks are free of users */
 	if (block_list) {
 		itr = list_iterator_create(block_list);
 		while ((bg_record = list_next(itr))) {
diff --git a/src/plugins/select/bluegene/bg_job_run.h b/src/plugins/select/bluegene/bg_job_run.h
index 5c9ef70eafebdf1b7399bf1f02dea223fcbe9836..3359073feafe93a55d6d68248d7bdaf8e5e0ac43 100644
--- a/src/plugins/select/bluegene/bg_job_run.h
+++ b/src/plugins/select/bluegene/bg_job_run.h
@@ -66,7 +66,7 @@ extern int sync_jobs(List job_list);
  * RET - SLURM_SUCCESS or an error code
  *
  * NOTE: This happens in parallel with srun and slurmd terminating
- * the job. Insure that this function, mpirun and the epilog can
+ * the job. Ensure that this function, mpirun and the epilog can
  * all deal with termination race conditions.
  */
 extern int term_job(struct job_record *job_ptr);
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 6c7c41cbc41a2f8f71ad7ecf2c7ff62a69a3c690..63e98c1c000542bd9533ebd57ee85b157c5c3055 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -2557,7 +2557,7 @@ void update_logging(void)
 		log_opts.stderr_level = LOG_LEVEL_QUIET;
 		if (!slurmctld_conf.slurmctld_logfile &&
 		    (slurmctld_conf.slurmctld_syslog_debug == LOG_LEVEL_QUIET)){
-			/* Insure fatal errors get logged somewhere */
+			/* Ensure fatal errors get logged somewhere */
 			log_opts.syslog_level = LOG_LEVEL_FATAL;
 		} else {
 			log_opts.syslog_level =
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 90496b41fb6f4dad15749a67ad1271ba044f2547..28dff23527ffaecdba12527fb628a5a2c97590b4 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -10642,7 +10642,7 @@ extern uint32_t get_next_job_id(bool test_only)
 	max_jobs = slurmctld_conf.max_job_id - slurmctld_conf.first_job_id;
 	tmp_id_sequence = MAX(job_id_sequence, slurmctld_conf.first_job_id);
 
-	/* Insure no conflict in job id if we roll over 32 bits */
+	/* Ensure no conflict in job id if we roll over 32 bits */
 	for (i = 0; i < max_jobs; i++) {
 		if (++tmp_id_sequence >= slurmctld_conf.max_job_id)
 			tmp_id_sequence = slurmctld_conf.first_job_id;
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 2144dffc25e56f92713d0b79626838bf622a88e3..dd3880976f9636c19088b932b7ac749ed263951f 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -1893,7 +1893,7 @@ static void _update_logging(void)
 		o->stderr_level = LOG_LEVEL_QUIET;
 		if (!conf->logfile &&
 		    (conf->syslog_debug == LOG_LEVEL_QUIET)) {
-			/* Insure fatal errors get logged somewhere */
+			/* Ensure fatal errors get logged somewhere */
  			o->syslog_level = LOG_LEVEL_FATAL;
 		} else {
 			o->syslog_level = conf->syslog_debug;
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index e2a8221f5684b79d03d8b81f84adaa26f0ce5716..fe2fcba84b78afaefb017b8dd78608f184b78837 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -2790,7 +2790,7 @@ _run_script_as_user(const char *name, const char *path, stepd_step_rec_t *job,
 			break;
 		}
 	}
-	/* Insure that all child processes get killed, one last time */
+	/* Ensure that all child processes get killed, one last time */
 	killpg(cpid, SIGKILL);
 
 	return status;
diff --git a/src/slurmd/slurmstepd/pdebug.c b/src/slurmd/slurmstepd/pdebug.c
index 1ae51bf20b04d1429d0f6013ffcc99cf2f994577..f73840fd1ec700b0f60a653c88ad7d9b816a34d3 100644
--- a/src/slurmd/slurmstepd/pdebug.c
+++ b/src/slurmd/slurmstepd/pdebug.c
@@ -149,7 +149,7 @@ static int _being_traced(pid_t pid)
 	fclose(fp);
 	if ((n == 0) || (n == max_len))
 		return -1;
-	buf[n] = '\0';	/* Insure string is terminated */
+	buf[n] = '\0';	/* Ensure string is terminated */
 	if ((match = strstr(buf, "TracerPid:")) == NULL)
 		return -1;
 	if (sscanf(match, "TracerPid:\t%d", &tracer_id) == EOF)
diff --git a/src/slurmdbd/slurmdbd.c b/src/slurmdbd/slurmdbd.c
index 3ebc731a1a0f3286275348ee75565f7480857a1a..d37cad28a7fd985e6ad68045d20744e02afc527e 100644
--- a/src/slurmdbd/slurmdbd.c
+++ b/src/slurmdbd/slurmdbd.c
@@ -509,7 +509,7 @@ static void _update_logging(bool startup)
 		log_opts.stderr_level = LOG_LEVEL_QUIET;
 		if (!slurmdbd_conf->log_file &&
 		    (slurmdbd_conf->syslog_debug == LOG_LEVEL_QUIET)) {
-			/* Insure fatal errors get logged somewhere */
+			/* Ensure fatal errors get logged somewhere */
  			log_opts.syslog_level = LOG_LEVEL_FATAL;
 		} else {
 			log_opts.syslog_level = slurmdbd_conf->syslog_debug;
diff --git a/testsuite/expect/test17.17 b/testsuite/expect/test17.17
index 066cd67d1e13c2813d445739183a6e128a27f885..007fc66feaedcdf418192021b38d4d685d359d95 100755
--- a/testsuite/expect/test17.17
+++ b/testsuite/expect/test17.17
@@ -92,7 +92,7 @@ make_bash_script $file_in "$srun $bin_sleep 5"
 
 #
 # Submit two jobs to the same node, one with no sharing, the other
-# with sharing permitted. Insure the first job completes before the
+# with sharing permitted. Ensure the first job completes before the
 # second job is started.
 #
 set sbatch_pid [spawn $sbatch -N1 --exclusive --nodelist=$nodelist_name -t1 --output=$file_out --error=$file_err  $file_in]
diff --git a/testsuite/slurm_unit/README b/testsuite/slurm_unit/README
index 963ab53d46f42d0d8d00a8a4e9fbde3444c054a7..43bead794b889d271e61c8a3b226aceb335ddb89 100644
--- a/testsuite/slurm_unit/README
+++ b/testsuite/slurm_unit/README
@@ -2,7 +2,7 @@ Deja Gnu Unit Tests
 
 1. These tests execute only when Slurm is built directly in the source
    directory, not when a separate build directory is used.
-2. Insure the "expect", "dejagnu" and "check" packages are installed.
+2. Ensure the "expect", "dejagnu" and "check" packages are installed.
 3. From the top level source directory, execute "make check", which builds
    the executable files including various src/common/*.o files that will be
    unit tested.