diff --git a/usr.sbin/bsdconfig/include/messages.subr b/usr.sbin/bsdconfig/include/messages.subr
index 47ef6876854b..de8a374728ea 100644
--- a/usr.sbin/bsdconfig/include/messages.subr
+++ b/usr.sbin/bsdconfig/include/messages.subr
@@ -67,7 +67,7 @@ msg_canada="Canada"
 msg_cancel="Cancel"
 msg_cancel_exit="Cancel/Exit"
 msg_cannot_create_permission_denied="%s: cannot create %s: Permission denied"
-msg_cannot_edit_wireless_ssid="Cannot edit wireless configuration; no matches for\nSSID \`%s' in wpa_supplicants.conf(5)"
+msg_cannot_edit_wireless_ssid="Cannot edit wireless configuration; no matches for\nSSID \`%s' in wpa_supplicant.conf(5)"
 msg_cannot_resolve_hostname="Cannot resolve \`%s'!  Are you sure that your\nname server, gateway and network interface are correctly configured?"
 msg_cant_find_distribution="Warning:  Can't find the \`%s' distribution on this\nFTP server.  You may need to visit a different server for\nthe release you are trying to fetch or go to the Options\nmenu and set the release name to explicitly match what's\navailable on %s (or set to \"any\").\n\nWould you like to select another FTP server?"
 msg_cant_seem_to_write_out_resolv_conf="Can't seem to write out %s.  Net cannot be used."
@@ -144,7 +144,7 @@ msg_finance_desc="Monetary, financial and related applications."
 msg_finland="Finland"
 msg_floppy="Floppy"
 msg_forget_all="Forget All"
-msg_forget_all_confirm="WARNING! Are you really sure you want to forget all known networks\nby re-initializing wpa_supplicants.conf(5)? This cannot be undone."
+msg_forget_all_confirm="WARNING! Are you really sure you want to forget all known networks\nby re-initializing wpa_supplicant.conf(5)? This cannot be undone."
 msg_forget_all_help="Reset wpa_supplicant(8) configuration, forgetting all known networks"
 msg_found="found"
 msg_france="France"
@@ -368,7 +368,7 @@ msg_shells_desc="Various shells (tcsh, bash, etc)."
 msg_show_all="Show All"
 msg_show_all_help="Show wireless networks without an SSID and all BSSIDs"
 msg_show_configured="Show Configured"
-msg_show_configured_help="Show networks configured in wpa_supplicants.conf(5)"
+msg_show_configured_help="Show networks configured in wpa_supplicant.conf(5)"
 msg_show_scan_results="Show Scan Results"
 msg_show_scan_results_help="Show wpa_cli(8) scan results"
 msg_skip="Skip"
diff --git a/usr.sbin/bsdconfig/share/media/wlan.subr b/usr.sbin/bsdconfig/share/media/wlan.subr
index f25cddff94cd..55910b77daf2 100644
--- a/usr.sbin/bsdconfig/share/media/wlan.subr
+++ b/usr.sbin/bsdconfig/share/media/wlan.subr
@@ -781,7 +781,7 @@ f_dialog_scan_wireless()
 # f_dialog_wireless_edit $ssid
 #
 # Display a menu to allow the user to either create a new entry for the
-# wpa_supplicants.conf(5) file, or to edit values for an existing entry.
+# wpa_supplicant.conf(5) file, or to edit values for an existing entry.
 #
 # If more than one wireless network is found to match $ssid, a sub-menu is
 # presented, allowing the user to select the desired network.
@@ -914,7 +914,7 @@ f_dialog_wireless_edit()
 	#
 	# XXXDT Unfinished
 	# This is where we display a menu that edits the entry
-	# And then we modify the wpa_supplicants.conf(5) config file
+	# And then we modify the wpa_supplicant.conf(5) config file
 	# XXXDT Unfinished
 	#
 
@@ -1208,7 +1208,7 @@ f_menu_wpa_scan_results()
 
 # f_dialog_menu_wireless_edit
 #
-# Display a list of wireless networks configured in wpa_supplicants.conf(5) and
+# Display a list of wireless networks configured in wpa_supplicant.conf(5) and
 # (if wpa_supplicant(8) is running) also displays scan results for unconfigured
 # wireless networks.
 #
@@ -1247,7 +1247,7 @@ f_dialog_menu_wireless_edit()
 		fi
 		if [ "$do_parse" -a "$DIALOG_MENU_WLAN_SHOW_CONFIGURED" ]
 		then
-			f_dprintf "$funcname: Parsing wpa_supplicants.conf(5)"
+			f_dprintf "$funcname: Parsing wpa_supplicant.conf(5)"
 			f_wpa_supplicant_parse "$conf_file" \
 			                       WIRELESS_ NWIRELESS_CONFIGS
 			f_dprintf "%s: Parsed %i wireless configurations" \
@@ -1262,7 +1262,7 @@ f_dialog_menu_wireless_edit()
 
 			#
 			# Add both items scanned from the airwaves and networks
-			# parsed from wpa_supplicants.conf(5). Latter items are
+			# parsed from wpa_supplicant.conf(5). Latter items are
 			# marked, sorted, and added to top of list above the
 			# former (which are unmarked and sorted separately).
 			#