diff --git a/iocBoot/iocxxx/common/save_restore.cmd b/iocBoot/iocxxx/common/save_restore.cmd
index d635da65b52c2727a348d4c9778dbb8a1b4639ca..d8af0d75f08293b3287dd482aa0b8eef4a2053fc 100644
--- a/iocBoot/iocxxx/common/save_restore.cmd
+++ b/iocBoot/iocxxx/common/save_restore.cmd
@@ -11,7 +11,7 @@
 
 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.req, SETTINGS_FILE=auto_settings.req")
+iocshLoad("$(AUTOSAVE)/iocsh/save_restore.iocsh",      "PREFIX=$(PREFIX), POSITIONS_FILE=auto_positions, SETTINGS_FILE=auto_settings")
 
 # Note that you can restore a .sav file without also autosaving to it.
 #set_pass0_restoreFile("octupole_settings.sav")
diff --git a/iocBoot/iocxxx/vxWorks/autoShutter.substitutions b/iocBoot/iocxxx/substitutions/autoShutter.substitutions
similarity index 100%
rename from iocBoot/iocxxx/vxWorks/autoShutter.substitutions
rename to iocBoot/iocxxx/substitutions/autoShutter.substitutions
diff --git a/iocBoot/iocxxx/common/canberra_13.substitutions b/iocBoot/iocxxx/substitutions/canberra_13.substitutions
similarity index 100%
rename from iocBoot/iocxxx/common/canberra_13.substitutions
rename to iocBoot/iocxxx/substitutions/canberra_13.substitutions
diff --git a/iocBoot/iocxxx/common/canberra_3.substitutions b/iocBoot/iocxxx/substitutions/canberra_3.substitutions
similarity index 100%
rename from iocBoot/iocxxx/common/canberra_3.substitutions
rename to iocBoot/iocxxx/substitutions/canberra_3.substitutions
diff --git a/iocBoot/iocxxx/vxWorks/femto_DxPCA_x00.substitutions b/iocBoot/iocxxx/substitutions/femto_DxPCA_x00.substitutions
similarity index 100%
rename from iocBoot/iocxxx/vxWorks/femto_DxPCA_x00.substitutions
rename to iocBoot/iocxxx/substitutions/femto_DxPCA_x00.substitutions
diff --git a/iocBoot/iocxxx/vxWorks/quadEM_pid.substitutions b/iocBoot/iocxxx/substitutions/quadEM_pid.substitutions
similarity index 100%
rename from iocBoot/iocxxx/vxWorks/quadEM_pid.substitutions
rename to iocBoot/iocxxx/substitutions/quadEM_pid.substitutions