diff --git a/iocBoot/iocxxx/common.iocsh b/iocBoot/iocxxx/common.iocsh
index 76f82c3665471970d8f288af7ee9cb5ca9e91692..91b25a0c50658f3b11a9627d4868ec0d92ba8099 100644
--- a/iocBoot/iocxxx/common.iocsh
+++ b/iocBoot/iocxxx/common.iocsh
@@ -1,3 +1,6 @@
+# Shell prompt
+epicsEnvSet("IOCSH_PS1", "$(IOC)> ")
+
 # prefix used for all PVs in this IOC
 epicsEnvSet("PREFIX", "xxx:")
 
@@ -16,7 +19,7 @@ epicsEnvSet("STREAM_PROTOCOL_PATH", ".")
 # Note for N doubles, need N*8 bytes+some overhead
 epicsEnvSet EPICS_CA_MAX_ARRAY_BYTES 64010
 
-### save_restore setup
+### save_restore setup, change SAVE_PATH if you are having autosave manage its own NFS mount
 iocshLoad("$(AUTOSAVE)/iocsh/autosave_settings.iocsh", "PREFIX=$(PREFIX), SAVE_PATH=$(TOP)/iocBoot/$(IOC)")
 iocshLoad("$(AUTOSAVE)/iocsh/autosaveBuild.iocsh",     "PREFIX=$(PREFIX)")
 iocshLoad("$(AUTOSAVE)/iocsh/save_restore.iocsh",      "PREFIX=$(PREFIX), POSITIONS_FILE=auto_positions, SETTINGS_FILE=auto_settings")
diff --git a/iocBoot/iocxxx/st.cmd.vxWorks b/iocBoot/iocxxx/st.cmd.vxWorks
index cf78ef4fa6176385cfe4333f457e49876c977962..acad500873b82c23416b5b276e32fe72837fd957 100644
--- a/iocBoot/iocxxx/st.cmd.vxWorks
+++ b/iocBoot/iocxxx/st.cmd.vxWorks
@@ -38,7 +38,7 @@ recDynLinkQsize = 1024
 dbLoadDatabase("$(TOP)/dbd/iocxxxVX.dbd")
 iocxxxVX_registerRecordDeviceDriver(pdbbase)
 
-shellPromptSet "iocvxWorks> "
+shellPromptSet "$(IOC)> "
 iocLogDisable=0
 
 # If you want save_restore to manage its own NFS mount, specify the name and