diff --git a/TODO b/TODO
index 233a3d7321c..8c1133404d9 100644
--- a/TODO
+++ b/TODO
@@ -2196,7 +2196,7 @@ o File system / Generic drivers (fs/, drivers/)
                available on the FLASH.  That would be rare with a cache
                size of a few hundred bytes and very large serial FLASH.
 
-               This issue does cause the test at apps/examples/fstest to
+               This issue does cause the test at apps/testing/fstest to
                fail.  That test fails with a "Partial Read" because the
                file being read is smaller than number bytes written to the
                file.  That test does write small files continuously until
diff --git a/configs/launchxl-cc1312r1/README.txt b/configs/launchxl-cc1312r1/README.txt
index 1ec06b7bf95..b514766d004 100644
--- a/configs/launchxl-cc1312r1/README.txt
+++ b/configs/launchxl-cc1312r1/README.txt
@@ -10,6 +10,7 @@ Contents
   o Serial Console
   o LEDs and Buttons
   o Version 1 or 2?
+  o Running from SRAM
 
 Status
 ======
@@ -48,4 +49,16 @@ Version 1 or 2?
   firmware will assert if you select the wrong version.  If that occurs,
   switch to the other version and the assertion should go away.
 
+Running from SRAM
+=================
 
+  The LaunchXL-CC1312R1 port supports execution from RAM.  Execution from
+  SRAM as a "safe" way to bring up a new board port without concern about
+  borking the board because of a bad FLASH image.
+
+  if CONFIG_BOOT_RUNFROMFLASH=y is set in the configuration, then the code
+  will build to run from FLASH.  Otherwise (presumably CONFIG_BOOT_RUNFROMSRAM=y)
+  the code will build to run from SRAM.  This is determined by the Make.defs
+  file in the scripts/ sub-directory.  Based on those configuration
+  settings, either scripts/flash.ld or sram.ld will be selected as the
+  linker script file to be used.
diff --git a/configs/mikroe-stm32f4/src/stm32_appinit.c b/configs/mikroe-stm32f4/src/stm32_appinit.c
index a76222d8c1f..cc4372c18e9 100644
--- a/configs/mikroe-stm32f4/src/stm32_appinit.c
+++ b/configs/mikroe-stm32f4/src/stm32_appinit.c
@@ -134,8 +134,8 @@
 #    define CONFIG_RAMMTD_ERASESIZE 4096
 #  endif
 
-#  ifndef CONFIG_EXAMPLES_SMART_NEBLOCKS
-#    define CONFIG_EXAMPLES_SMART_NEBLOCKS (22)
+#  ifndef CONFIG_TESTING_SMART_NEBLOCKS
+#    define CONFIG_TESTING_SMART_NEBLOCKS (22)
 #  endif
 
 #ifdef CONFIG_MIKROE_RAMMTD
diff --git a/configs/sim/README.txt b/configs/sim/README.txt
index 7a763c7a60b..4daccd91659 100644
--- a/configs/sim/README.txt
+++ b/configs/sim/README.txt
@@ -785,7 +785,7 @@ nx11
 
 nxffs
 
-  This is a test of the NXFFS file system using the apps/examples/nxffs
+  This is a test of the NXFFS file system using the apps/testing/nxffs
   test with an MTD RAM driver to simulate the FLASH part.
 
 nxlines
@@ -894,7 +894,7 @@ sixlowpan
 
 spiffs
 
-  This is a test of the SPIFFS file system using the apps/examples/fstest
+  This is a test of the SPIFFS file system using the apps/testing/fstest
   test with an MTD RAM driver to simulate the FLASH part.
 
 touchscreen
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index 1e1db62a391..d1f5cda40fe 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -11,7 +11,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_EXAMPLES_CONFIGDATA=y
 CONFIG_EXAMPLES_CONFIGDATA_NLOOPS=10000
 CONFIG_EXAMPLES_CONFIGDATA_SILENT=y
-CONFIG_EXAMPLES_NXFFS=y
+CONFIG_TESTING_NXFFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_NXFFS=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 718d3bde3c1..f9637c0e706 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -8,7 +8,7 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
-CONFIG_EXAMPLES_NXFFS=y
+CONFIG_TESTING_NXFFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_NXFFS=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
diff --git a/configs/sim/spiffs/defconfig b/configs/sim/spiffs/defconfig
index 9be75425267..e6160144dfc 100644
--- a/configs/sim/spiffs/defconfig
+++ b/configs/sim/spiffs/defconfig
@@ -11,10 +11,10 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
-CONFIG_EXAMPLES_FSTEST=y
-CONFIG_EXAMPLES_FSTEST_MOUNTPT="/mnt/spiffs"
-CONFIG_EXAMPLES_FSTEST_NLOOPS=10
-CONFIG_EXAMPLES_FSTEST_STACKSIZE=8192
+CONFIG_TESTING_FSTEST=y
+CONFIG_TESTING_FSTEST_MOUNTPT="/mnt/spiffs"
+CONFIG_TESTING_FSTEST_NLOOPS=10
+CONFIG_TESTING_FSTEST_STACKSIZE=8192
 CONFIG_FS_SPIFFS=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIB_RAND_ORDER=3
diff --git a/include/nuttx/signal.h b/include/nuttx/signal.h
index d25e9aac264..7480858bd3d 100644
--- a/include/nuttx/signal.h
+++ b/include/nuttx/signal.h
@@ -190,7 +190,7 @@ int nxsig_action(int signo, FAR const struct sigaction *act,
  *   sigqueue() except that it does not modify the errno value.
  *
  * Input Parameters:
- *   pid - Process ID of task to receive signal
+ *   pid   - Process ID of task to receive signal
  *   signo - Signal number
  *   value - Value to pass to task with signal
  *