diff --git a/src/makeBaseApp/makeBaseApp.pl b/src/makeBaseApp/makeBaseApp.pl
index 547b3b5dd..6df84393f 100755
--- a/src/makeBaseApp/makeBaseApp.pl
+++ b/src/makeBaseApp/makeBaseApp.pl
@@ -120,6 +120,7 @@ if ($opt_i) {
     find(\&FCopyTree, "$top/$apptypename");
 
     foreach $ioc ( @ARGV ) {
+	($appname = $ioc) =~ s/App$//;
 	$ioc = "ioc" . $ioc unless ($ioc =~ /^ioc/);
         if (-d "iocBoot/$ioc") {
 	    print "iocBoot/$ioc exists, not modified.\n";
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common
index 605ad505d..f730a9dcf 100644
--- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common
+++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common
@@ -1,7 +1,7 @@
-#!../../bin/_ARCH_/_IOC_
+#!../../bin/_ARCH_/_APPNAME_
 ## The names of the binary above and .dbd file below will be incorrect
 ## unless you used the same names for the ioc and the app directory.
-dbLoadDatabase("../../dbd/_IOC_.dbd",0,0)
+dbLoadDatabase("../../dbd/_APPNAME_.dbd",0,0)
 
 registerRecordDeviceDriver(pdbbase)