diff --git a/modules/packages/RecordParser.chpl b/modules/packages/RecordParser.chpl
index 1c383e22ebd6..85d0aeadc931 100644
--- a/modules/packages/RecordParser.chpl
+++ b/modules/packages/RecordParser.chpl
@@ -118,7 +118,7 @@ class RecordReader {
   /* The regular expression to read (using match on the channel) */
   var matchRegex: regex(string);
   @chpldoc.nodoc
-  param num_fields = numFields(t); // Number of fields in record
+  param num_fields = getNumFields(t); // Number of fields in record
 
   /* Create a RecordReader to match an auto-generated regular expression
      for a record created by the :proc:`createRegex` routine.
diff --git a/modules/packages/ZMQ.chpl b/modules/packages/ZMQ.chpl
index 6da4fc8947af..0f86f29c9793 100644
--- a/modules/packages/ZMQ.chpl
+++ b/modules/packages/ZMQ.chpl
@@ -942,7 +942,7 @@ module ZMQ {
                                                      (!isBytes(T))) {
       on classRef.home {
         var copy = data;
-        param N = numFields(T);
+        param N = getNumFields(T);
         for param i in 0..<(N-1) do
           try send(getField(copy,i), ZMQ_SNDMORE | flags);
 
@@ -1045,7 +1045,7 @@ module ZMQ {
       var ret: T;
       on classRef.home {
         var data: T;
-        for param i in 0..<numFields(T) do
+        for param i in 0..<getNumFields(T) do
           getFieldRef(data,i) = try recv(getField(data,i).type);
         ret = data;
       }
diff --git a/modules/standard/CommDiagnostics.chpl b/modules/standard/CommDiagnostics.chpl
index 2c8708ff0340..2ee6a0e827e4 100644
--- a/modules/standard/CommDiagnostics.chpl
+++ b/modules/standard/CommDiagnostics.chpl
@@ -319,7 +319,7 @@ module CommDiagnostics
 
       var first = true;
       c.write("(");
-      for param i in 0..<numFields(chpl_commDiagnostics) {
+      for param i in 0..<getNumFields(chpl_commDiagnostics) {
         param name = getFieldName(chpl_commDiagnostics, i);
         const val = getField(this, i);
         if val != 0 {
@@ -474,7 +474,7 @@ module CommDiagnostics
     var CommDiags = getCommDiagnostics();
 
     // cache number of fields and store vector of whether field is active
-    param nFields = numFields(chpl_commDiagnostics);
+    param nFields = getNumFields(chpl_commDiagnostics);
 
     // How wide should the column be for this field?  A negative value
     // indicates an unstable field.  0 indicates that the field should
diff --git a/modules/standard/Reflection.chpl b/modules/standard/Reflection.chpl
index 3259d179b2c7..36fa2bdffd6a 100644
--- a/modules/standard/Reflection.chpl
+++ b/modules/standard/Reflection.chpl
@@ -23,18 +23,8 @@
    Functions for reflecting about language elements, such as fields,
    functions, and methods.
 
-   .. note ::
-
-     There are several ways in which this module could be improved:
-
-       * the methods here might be better as type methods,
-         so you could use `R.numFields()` instead of `numFields(R)`.
-       * :proc:`getField` does not yet return a mutable value.
-
-   .. note ::
-
-     For reflecting about aspects of the compilation process, see
-     :mod:`ChplConfig`.
+   For reflecting about aspects of the compilation process, see
+   :mod:`ChplConfig`.
 */
 module Reflection {
 
@@ -58,11 +48,17 @@ private proc checkQueryT(type t) type {
 /* Return the number of fields in a class or record as a param.
    The count of fields includes types and param fields.
  */
-proc numFields(type t) param : int do
+proc getNumFields(type t) param : int do
   return __primitive("num fields", checkQueryT(t));
 
+/* Return the number of fields in a class or record as a param.
+   The count of fields includes types and param fields.
+ */
+@deprecated(notes="'numFields' is deprecated - please use 'getNumFields' instead")
+proc numFields(type t) param : int do return getNumFields(t);
+
 /* Get the name of the field at `idx` in a class or record.
-   Causes a compilation error if `idx` is not in 0..<numFields(t).
+   Causes a compilation error if `idx` is not in 0..<getNumFields(t).
 
    :arg t: a class or record type
    :arg idx: which field to get the name of
@@ -75,14 +71,14 @@ proc getFieldName(type t, param idx:int) param : string do
 // over the const ref one.
 /* Get the field at `idx` in a class or record. When the field at `idx`
    is a `param`, this overload will be chosen to return a `param`.
-   Causes a compilation error if `idx` is not in 0..<numFields(t).
+   Causes a compilation error if `idx` is not in 0..<getNumFields(t).
 
    :arg obj: a class or record
    :arg idx: which field to get
    :returns: the `param` that field represents
 */
 proc getField(const ref obj:?t, param idx: int) param
-  where idx >= 0 && idx < numFields(t) &&
+  where idx >= 0 && idx < getNumFields(t) &&
         isParam(__primitive("field by num", obj, idx+1)) {
 
   return __primitive("field by num", obj, idx+1);
@@ -92,20 +88,20 @@ proc getField(const ref obj:?t, param idx: int) param
 // over the const ref one.
 /* Get the field at `idx` in a class or record. When the field at `idx`
    is a `type` variable, this overload will be chosen to return a type.
-   Causes a compilation error if `idx` is not in 0..<numFields(t).
+   Causes a compilation error if `idx` is not in 0..<getNumFields(t).
 
    :arg obj: a class or record
    :arg idx: which field to get
    :returns: the type that field represents
 */
 proc getField(const ref obj:?t, param idx: int) type
-  where idx >= 0 && idx < numFields(t) &&
+  where idx >= 0 && idx < getNumFields(t) &&
         isType(__primitive("field by num", obj, idx+1)) {
   return __primitive("field by num", obj, idx+1);
 }
 
 /* Get the field at `idx` in a class or record.
-   Causes a compilation error if `idx` is not in 0..<numFields(t).
+   Causes a compilation error if `idx` is not in 0..<getNumFields(t).
 
    :arg obj: a class or record
    :arg idx: which field to get
@@ -200,7 +196,7 @@ proc getImplementationField(const ref x:?t, param i:int) const ref {
 }
 
 /* Get a mutable ref to the ith field in a class or record.
-   Causes a compilation error if `i` is not in 0..<numFields(t)
+   Causes a compilation error if `i` is not in 0..<getNumFields(t)
    or if the argument is not mutable.
 
    :arg x: a class or record
@@ -208,8 +204,8 @@ proc getImplementationField(const ref x:?t, param i:int) const ref {
    :returns: an rvalue referring to that field.
  */
 pragma "unsafe"
-inline
-proc getFieldRef(ref x:?t, param i:int) ref do
+@unstable(reason="'getFieldRef' is unstable")
+inline proc getFieldRef(ref x:?t, param i:int) ref do
   return __primitive("field by num", x, i+1);
 
 /* Get a mutable ref to a field in a class or record by name.
@@ -221,6 +217,7 @@ proc getFieldRef(ref x:?t, param i:int) ref do
    :returns: an rvalue referring to that field.
  */
 pragma "unsafe"
+@unstable(reason="'getFieldRef' is unstable")
 proc getFieldRef(ref x:?t, param s:string) ref {
   param i = __primitive("field name to num", t, s);
   if i == 0 then
@@ -256,6 +253,7 @@ proc hasField(type t, param name:string) param : bool do
    :arg idx: which field to query
    :returns: ``true`` if the field is instantiated
 */
+@unstable(reason="'isFieldBound' is unstable - consider using 'T.fieldName != ?' syntax instead")
 proc isFieldBound(type t, param idx: int) param : bool {
   return __primitive("is bound", checkQueryT(t),
                      getFieldName(checkQueryT(t), idx));
@@ -268,6 +266,7 @@ proc isFieldBound(type t, param idx: int) param : bool {
    :arg name: the name of a field
    :returns: ``true`` if the field is instantiated
 */
+@unstable(reason="'isFieldBound' is unstable - consider using 'T.fieldName != ?' syntax instead")
 proc isFieldBound(type t, param name : string) param : bool {
   return __primitive("is bound", checkQueryT(t), name);
 }
@@ -275,12 +274,14 @@ proc isFieldBound(type t, param name : string) param : bool {
 /* Returns ``true`` if a function named `fname` taking no arguments
    could be called in the current scope.
    */
+@unstable(reason="The 'canResolve...' family of procedures are unstable")
 proc canResolve(param fname : string) param : bool do
   return __primitive("call and fn resolves", fname);
 
 /* Returns ``true`` if a function named `fname` taking the arguments in
    `args` could be called in the current scope.
    */
+@unstable(reason="The 'canResolve...' family of procedures are unstable")
 proc canResolve(param fname : string, args ...) param : bool do
   return __primitive("call and fn resolves", fname, (...args));
 
@@ -289,24 +290,28 @@ proc canResolve(param fname : string, args ...) param : bool do
 /* Returns ``true`` if a method named `fname` taking no arguments
    could be called on `obj` in the current scope.
    */
+@unstable(reason="The 'canResolve...' family of procedures are unstable")
 proc canResolveMethod(obj, param fname : string) param : bool do
   return __primitive("method call and fn resolves", obj, fname);
 
 /* Returns ``true`` if a method named `fname` taking the arguments in
    `args` could be called on `obj` in the current scope.
    */
+@unstable(reason="The 'canResolve...' family of procedures are unstable")
 proc canResolveMethod(obj, param fname : string, args ...) param : bool do
   return __primitive("method call and fn resolves", obj, fname, (...args));
 
 /* Returns ``true`` if a type method named `fname` taking no
    arguments could be called on type `t` in the current scope.
    */
+@unstable(reason="The 'canResolve...' family of procedures are unstable")
 proc canResolveTypeMethod(type t, param fname : string) param : bool do
   return __primitive("method call and fn resolves", t, fname);
 
 /* Returns ``true`` if a type method named `fname` taking the
    arguments in `args` could be called on type `t` in the current scope.
    */
+@unstable(reason="The 'canResolve...' family of procedures are unstable")
 proc canResolveTypeMethod(type t, param fname : string, args ...) param : bool do
   return __primitive("method call and fn resolves", t, fname, (...args));
 
diff --git a/test/compflags/TestWarnUnstableSuppression.2.good b/test/compflags/TestWarnUnstableSuppression.2.good
index c143a7591454..02638320dbfa 100644
--- a/test/compflags/TestWarnUnstableSuppression.2.good
+++ b/test/compflags/TestWarnUnstableSuppression.2.good
@@ -1,37 +1 @@
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: In function 'chpl__distributed':
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
 $CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: chpl_unstableInternalSymbolForTesting is unstable
-$CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU_MEM_STRATEGY' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/Atomics.chpl:nnnn: warning: 'ChplConfig.CHPL_NETWORK_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: In function 'supportsNativeSyncVar':
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: warning: 'ChplConfig.CHPL_TASKS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: In function '_simpleTransfer':
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelGpuSupport.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelHashtable.chpl:nnnn: In function '_allocateData':
-$CHPL_HOME/modules/internal/ChapelHashtable.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: In function 'localSpawn':
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: In function 'doSearchNoEnc':
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-  $CHPL_HOME/modules/internal/String.chpl:nnnn: called as doSearchNoEnc(x: string, needle: string, region: range(byteIndex,low,one), param count = false, param fromLeft = true)
-  within internal functions (use --print-callstack-on-error to see)
-$CHPL_HOME/modules/internal/String.chpl:nnnn: In method 'doSearchUTF8':
-$CHPL_HOME/modules/internal/String.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-$CHPL_HOME/modules/internal/String.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-  $CHPL_HOME/modules/internal/String.chpl:nnnn: called as string.doSearchUTF8(pattern: string, indices: range(byteIndex,low,one), param count = false, param fromLeft = true)
-  within internal functions (use --print-callstack-on-error to see)
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: In function 'warmupRuntime':
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
diff --git a/test/compflags/TestWarnUnstableSuppression.3.good b/test/compflags/TestWarnUnstableSuppression.3.good
index 28d46dae3d58..a9847265bae9 100644
--- a/test/compflags/TestWarnUnstableSuppression.3.good
+++ b/test/compflags/TestWarnUnstableSuppression.3.good
@@ -1,80 +1 @@
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: In method 'createDomain':
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: In function 'newBlockDom':
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: sparse domains are unstable, their behavior is likely to change in the future
 $CHPL_HOME/modules/standard/Reflection.chpl:nnnn: warning: chpl_unstableStandardSymbolForTesting is unstable
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOME' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_COMPILER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_COMPILER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_CPU' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GASNET_SEGMENT' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LIBFABRIC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TASKS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LAUNCHER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TIMERS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_UNWIND' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_MEM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_MAKE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_NETWORK_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GMP' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HWLOC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_JEMALLOC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_RE2' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LLVM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU_MEM_STRATEGY' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/Regex.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Regex.chpl:nnnn: warning: 'ChplConfig.CHPL_RE2' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/packages/CopyAggregation.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/packages/CopyAggregation.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method 'first':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method 'last':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_warnForParSafeIndexing':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Time.chpl:nnnn: In function 'tm_zoneType':
-$CHPL_HOME/modules/standard/Time.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: In function 'getDefaultSparseDist':
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method 'extend':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_warnForParSafeIndexing':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: In function '_modestring':
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: append mode is unstable
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In method 'deinit':
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
diff --git a/test/compflags/TestWarnUnstableSuppression.4.good b/test/compflags/TestWarnUnstableSuppression.4.good
index 53f6ace32bf9..77b70332c061 100644
--- a/test/compflags/TestWarnUnstableSuppression.4.good
+++ b/test/compflags/TestWarnUnstableSuppression.4.good
@@ -1,39 +1,3 @@
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: In function 'chpl__distributed':
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
 TestWarnUnstableSuppression.chpl:2: warning: chpl_unstableInternalSymbolForTesting is unstable
 TestWarnUnstableSuppression.chpl:3: warning: chpl_unstableStandardSymbolForTesting is unstable
 $CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: chpl_unstableInternalSymbolForTesting is unstable
-$CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU_MEM_STRATEGY' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/Atomics.chpl:nnnn: warning: 'ChplConfig.CHPL_NETWORK_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: In function 'supportsNativeSyncVar':
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: warning: 'ChplConfig.CHPL_TASKS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: In function '_simpleTransfer':
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelGpuSupport.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelHashtable.chpl:nnnn: In function '_allocateData':
-$CHPL_HOME/modules/internal/ChapelHashtable.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: In function 'localSpawn':
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: In function 'doSearchNoEnc':
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-  $CHPL_HOME/modules/internal/String.chpl:nnnn: called as doSearchNoEnc(x: string, needle: string, region: range(byteIndex,low,one), param count = false, param fromLeft = true)
-  within internal functions (use --print-callstack-on-error to see)
-$CHPL_HOME/modules/internal/String.chpl:nnnn: In method 'doSearchUTF8':
-$CHPL_HOME/modules/internal/String.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-$CHPL_HOME/modules/internal/String.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-  $CHPL_HOME/modules/internal/String.chpl:nnnn: called as string.doSearchUTF8(pattern: string, indices: range(byteIndex,low,one), param count = false, param fromLeft = true)
-  within internal functions (use --print-callstack-on-error to see)
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: In function 'warmupRuntime':
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
diff --git a/test/compflags/TestWarnUnstableSuppression.5.good b/test/compflags/TestWarnUnstableSuppression.5.good
index 96a9c8602bb6..7ceeec1f9775 100644
--- a/test/compflags/TestWarnUnstableSuppression.5.good
+++ b/test/compflags/TestWarnUnstableSuppression.5.good
@@ -1,82 +1,3 @@
 TestWarnUnstableSuppression.chpl:2: warning: chpl_unstableInternalSymbolForTesting is unstable
 TestWarnUnstableSuppression.chpl:3: warning: chpl_unstableStandardSymbolForTesting is unstable
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: In method 'createDomain':
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: In function 'newBlockDom':
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: sparse domains are unstable, their behavior is likely to change in the future
 $CHPL_HOME/modules/standard/Reflection.chpl:nnnn: warning: chpl_unstableStandardSymbolForTesting is unstable
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOME' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_COMPILER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_COMPILER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_CPU' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GASNET_SEGMENT' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LIBFABRIC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TASKS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LAUNCHER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TIMERS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_UNWIND' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_MEM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_MAKE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_NETWORK_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GMP' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HWLOC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_JEMALLOC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_RE2' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LLVM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU_MEM_STRATEGY' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/Regex.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Regex.chpl:nnnn: warning: 'ChplConfig.CHPL_RE2' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/packages/CopyAggregation.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/packages/CopyAggregation.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method 'first':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method 'last':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_warnForParSafeIndexing':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Time.chpl:nnnn: In function 'tm_zoneType':
-$CHPL_HOME/modules/standard/Time.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: In function 'getDefaultSparseDist':
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method 'extend':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_warnForParSafeIndexing':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: In function '_modestring':
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: append mode is unstable
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In method 'deinit':
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
diff --git a/test/compflags/TestWarnUnstableSuppression.6.good b/test/compflags/TestWarnUnstableSuppression.6.good
index 8c140d65b371..80b1507d3716 100644
--- a/test/compflags/TestWarnUnstableSuppression.6.good
+++ b/test/compflags/TestWarnUnstableSuppression.6.good
@@ -1,117 +1,2 @@
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: In function 'chpl__distributed':
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: In method 'createDomain':
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: In function 'newBlockDom':
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: sparse domains are unstable, their behavior is likely to change in the future
 $CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: chpl_unstableInternalSymbolForTesting is unstable
-$CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU_MEM_STRATEGY' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/Atomics.chpl:nnnn: warning: 'ChplConfig.CHPL_NETWORK_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: In function 'supportsNativeSyncVar':
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: warning: 'ChplConfig.CHPL_TASKS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: In function '_simpleTransfer':
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelGpuSupport.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelHashtable.chpl:nnnn: In function '_allocateData':
-$CHPL_HOME/modules/internal/ChapelHashtable.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: In function 'localSpawn':
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
 $CHPL_HOME/modules/standard/Reflection.chpl:nnnn: warning: chpl_unstableStandardSymbolForTesting is unstable
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOME' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_COMPILER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_COMPILER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_CPU' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GASNET_SEGMENT' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LIBFABRIC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TASKS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LAUNCHER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TIMERS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_UNWIND' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_MEM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_MAKE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_NETWORK_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GMP' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HWLOC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_JEMALLOC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_RE2' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LLVM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU_MEM_STRATEGY' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/Regex.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Regex.chpl:nnnn: warning: 'ChplConfig.CHPL_RE2' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/packages/CopyAggregation.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/packages/CopyAggregation.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method 'first':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method 'last':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_warnForParSafeIndexing':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Time.chpl:nnnn: In function 'tm_zoneType':
-$CHPL_HOME/modules/standard/Time.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: In function 'getDefaultSparseDist':
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method 'extend':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_warnForParSafeIndexing':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: In function '_modestring':
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: append mode is unstable
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: In function 'doSearchNoEnc':
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-  $CHPL_HOME/modules/internal/String.chpl:nnnn: called as doSearchNoEnc(x: string, needle: string, region: range(byteIndex,low,one), param count = false, param fromLeft = true)
-  within internal functions (use --print-callstack-on-error to see)
-$CHPL_HOME/modules/internal/String.chpl:nnnn: In method 'doSearchUTF8':
-$CHPL_HOME/modules/internal/String.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-$CHPL_HOME/modules/internal/String.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-  $CHPL_HOME/modules/internal/String.chpl:nnnn: called as string.doSearchUTF8(pattern: string, indices: range(byteIndex,low,one), param count = false, param fromLeft = true)
-  within internal functions (use --print-callstack-on-error to see)
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In method 'deinit':
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: In function 'warmupRuntime':
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
diff --git a/test/compflags/TestWarnUnstableSuppression.7.good b/test/compflags/TestWarnUnstableSuppression.7.good
index d7fe1cb527f7..39b127f30295 100644
--- a/test/compflags/TestWarnUnstableSuppression.7.good
+++ b/test/compflags/TestWarnUnstableSuppression.7.good
@@ -1,119 +1,4 @@
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: In function 'chpl__distributed':
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/internal/ChapelArray.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
 TestWarnUnstableSuppression.chpl:2: warning: chpl_unstableInternalSymbolForTesting is unstable
 TestWarnUnstableSuppression.chpl:3: warning: chpl_unstableStandardSymbolForTesting is unstable
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: In method 'createDomain':
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: In function 'newBlockDom':
-$CHPL_HOME/modules/dists/BlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: 'dmapped' keyword is unstable, instead please use factory functions when available
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: sparse domains are unstable, their behavior is likely to change in the future
 $CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: chpl_unstableInternalSymbolForTesting is unstable
-$CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU_MEM_STRATEGY' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelBase.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/Atomics.chpl:nnnn: warning: 'ChplConfig.CHPL_NETWORK_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: In function 'supportsNativeSyncVar':
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: warning: 'ChplConfig.CHPL_TASKS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelSyncvar.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: In function '_simpleTransfer':
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/DefaultRectangular.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelGpuSupport.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/ChapelHashtable.chpl:nnnn: In function '_allocateData':
-$CHPL_HOME/modules/internal/ChapelHashtable.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: In function 'localSpawn':
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
 $CHPL_HOME/modules/standard/Reflection.chpl:nnnn: warning: chpl_unstableStandardSymbolForTesting is unstable
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOME' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HOST_COMPILER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_COMPILER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_ARCH' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_CPU' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LOCALE_MODEL' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM_SUBSTRATE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GASNET_SEGMENT' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LIBFABRIC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TASKS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LAUNCHER' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_TIMERS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_UNWIND' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_MEM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_MAKE' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_NETWORK_ATOMICS' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GMP' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_HWLOC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_JEMALLOC' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_RE2' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_LLVM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU_MEM_STRATEGY' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/ChplConfig.chpl:nnnn: warning: 'ChplConfig.CHPL_GPU' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/Regex.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Regex.chpl:nnnn: warning: 'ChplConfig.CHPL_RE2' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/packages/CopyAggregation.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/packages/CopyAggregation.chpl:nnnn: warning: 'ChplConfig.CHPL_COMM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method 'first':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method 'last':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/List.chpl:nnnn: In method '_warnForParSafeIndexing':
-$CHPL_HOME/modules/standard/List.chpl:nnnn: warning: 'list.parSafe' is unstable and is expected to be replaced by a separate list type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/Set.chpl:nnnn: warning: 'set.parSafe' is unstable and is expected to be replaced by a separate set type in the future
-$CHPL_HOME/modules/standard/Time.chpl:nnnn: In function 'tm_zoneType':
-$CHPL_HOME/modules/standard/Time.chpl:nnnn: warning: 'ChplConfig.CHPL_TARGET_PLATFORM' is unstable and may be replaced with a different way to access this information in the future
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: In function 'getDefaultSparseDist':
-$CHPL_HOME/modules/dists/SparseBlockDist.chpl:nnnn: warning: the type 'dmap' is unstable, instead please use distribution factory functions when available
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_enter':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_leave':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method 'extend':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In method '_warnForParSafeIndexing':
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Map.chpl:nnnn: warning: 'map.parSafe' is unstable and is expected to be replaced by a separate map type in the future
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: In function '_modestring':
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: append mode is unstable
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: In function 'doSearchNoEnc':
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-$CHPL_HOME/modules/internal/BytesStringCommon.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-  $CHPL_HOME/modules/internal/String.chpl:nnnn: called as doSearchNoEnc(x: string, needle: string, region: range(byteIndex,low,one), param count = false, param fromLeft = true)
-  within internal functions (use --print-callstack-on-error to see)
-$CHPL_HOME/modules/internal/String.chpl:nnnn: In method 'doSearchUTF8':
-$CHPL_HOME/modules/internal/String.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-$CHPL_HOME/modules/internal/String.chpl:nnnn: warning: range.orderToIndex() is unstable and its behavior may change in the future
-  $CHPL_HOME/modules/internal/String.chpl:nnnn: called as string.doSearchUTF8(pattern: string, indices: range(byteIndex,low,one), param count = false, param fromLeft = true)
-  within internal functions (use --print-callstack-on-error to see)
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In method 'deinit':
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: In function 'warmupRuntime':
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/internal/ChapelLocale.chpl:nnnn: warning: 'deallocate' is unstable, and may be renamed or moved
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: In initializer:
-$CHPL_HOME/modules/standard/Errors.chpl:nnnn: warning: 'allocate' is unstable, and may be renamed or moved
diff --git a/test/compflags/TestWarnUnstableSuppression.prediff b/test/compflags/TestWarnUnstableSuppression.prediff
index d338add2b2dd..ef0fb7b15d56 100755
--- a/test/compflags/TestWarnUnstableSuppression.prediff
+++ b/test/compflags/TestWarnUnstableSuppression.prediff
@@ -5,5 +5,7 @@
 # There and in many other prediffs, the match pattern is /:[0-9:]*:/
 # Here we drop : inside [] because it is not needed.
 
-sed '\|CHPL_HOME/modules|s/:[0-9]*:/:nnnn:/' $2 > $2.tmp
-mv $2.tmp $2
+sed '\|CHPL_HOME/modules|s/:[0-9]*:/:nnnn:/' $2 > $2.1.tmp
+grep 'chpl_unstableStandardSymbolForTesting\|chpl_unstableInternalSymbolForTesting' $2.1.tmp > $2.2.tmp
+mv $2.2.tmp $2
+rm $2.1.tmp
diff --git a/test/deprecated/ReflectionNumFields.chpl b/test/deprecated/ReflectionNumFields.chpl
new file mode 100644
index 000000000000..296446ece4e2
--- /dev/null
+++ b/test/deprecated/ReflectionNumFields.chpl
@@ -0,0 +1,7 @@
+use Reflection;
+
+record rec { var x = 0; }
+
+proc main() {
+  param n = numFields(rec);
+}
diff --git a/test/deprecated/ReflectionNumFields.good b/test/deprecated/ReflectionNumFields.good
new file mode 100644
index 000000000000..3b291511faae
--- /dev/null
+++ b/test/deprecated/ReflectionNumFields.good
@@ -0,0 +1,2 @@
+ReflectionNumFields.chpl:5: In function 'main':
+ReflectionNumFields.chpl:6: warning: 'numFields' is deprecated - please use 'getNumFields' instead
diff --git a/test/functions/resolution/ignore-unreachable.chpl b/test/functions/resolution/ignore-unreachable.chpl
index daa99bac4dde..c72aa0309e4f 100644
--- a/test/functions/resolution/ignore-unreachable.chpl
+++ b/test/functions/resolution/ignore-unreachable.chpl
@@ -9,7 +9,7 @@ record Foo {
 
 var foo = new Foo();
 
-for param i in 0..<numFields(foo.type) {
+for param i in 0..<getNumFields(foo.type) {
     if isType(getField(foo,i)) {
         continue;
     }
diff --git a/test/library/packages/csv/CSV.chpl b/test/library/packages/csv/CSV.chpl
index 532982d3077f..be5861e35d10 100644
--- a/test/library/packages/csv/CSV.chpl
+++ b/test/library/packages/csv/CSV.chpl
@@ -72,7 +72,7 @@ module CSV {
         if line.size == 0 then
           continue;
         const vals = line.split(sep);
-        for param i in 0..numFields(t)-1 {
+        for param i in 0..getNumFields(t)-1 {
           getFieldRef(r, i) = vals[i]: getField(r, i).type;
         }
         if skipHeader {
@@ -158,9 +158,9 @@ module CSV {
       use Reflection;
       if !writing then compilerError("writing to a reading channel");
 
-      for param i in 0..<numFields(t) {
+      for param i in 0..<getNumFields(t) {
         ch.write(getField(r, i));
-        if i != numFields(t)-1 then
+        if i != getNumFields(t)-1 then
           ch.write(sep);
       }
       ch.writeln();
diff --git a/test/library/standard/Reflection/field-queries-error-int.chpl b/test/library/standard/Reflection/field-queries-error-int.chpl
index 936c2bc201b4..96e7afc1f45d 100644
--- a/test/library/standard/Reflection/field-queries-error-int.chpl
+++ b/test/library/standard/Reflection/field-queries-error-int.chpl
@@ -1,6 +1,6 @@
-// Check that numFields() responds gracefully to an invalid argument type.
+// Check that getNumFields() responds gracefully to an invalid argument type.
 // See also: test/param/ferguson/field*
 
 use Reflection;
 
-param nf = numFields(int);
+param nf = getNumFields(int);
diff --git a/test/library/standard/Reflection/field-queries-error-string.chpl b/test/library/standard/Reflection/field-queries-error-string.chpl
index ec16cd0dd2a7..a556992a5cd3 100644
--- a/test/library/standard/Reflection/field-queries-error-string.chpl
+++ b/test/library/standard/Reflection/field-queries-error-string.chpl
@@ -1,6 +1,6 @@
-// Check that numFields() responds gracefully to an invalid argument type.
+// Check that getNumFields() responds gracefully to an invalid argument type.
 // See also: test/param/ferguson/field*
 
 use Reflection;
 
-param nf = numFields(string);
+param nf = getNumFields(string);
diff --git a/test/library/standard/Reflection/field-queries-ok.chpl b/test/library/standard/Reflection/field-queries-ok.chpl
index 5c82227bdfab..1c591afdbe57 100644
--- a/test/library/standard/Reflection/field-queries-ok.chpl
+++ b/test/library/standard/Reflection/field-queries-ok.chpl
@@ -1,10 +1,10 @@
-// Check that numFields et al. handles a variety of aggregate types.
+// Check that getNumFields et al. handles a variety of aggregate types.
 // See also: test/param/ferguson/field*
 use Reflection;
 
 proc test(type tp) {
   compilerWarning("===== ", tp:string);
-  compilerWarning("  numFields       ", numFields(tp)            :string);
+  compilerWarning("  getNumFields    ", getNumFields(tp)         :string);
   compilerWarning("  getFieldName    ", getFieldName(tp, 5)             );
   compilerWarning("  hasField        ", hasField(tp, "f6")       :string);
   compilerWarning("  getFieldIndex   ", getFieldIndex(tp, "f6")  :string);
diff --git a/test/library/standard/Reflection/field-queries-ok.good b/test/library/standard/Reflection/field-queries-ok.good
index b472b7a172ad..4c97145879d6 100644
--- a/test/library/standard/Reflection/field-queries-ok.good
+++ b/test/library/standard/Reflection/field-queries-ok.good
@@ -1,152 +1,152 @@
 field-queries-ok.chpl:20: warning: ===== CCon
-field-queries-ok.chpl:20: warning:   numFields       6
+field-queries-ok.chpl:20: warning:   getNumFields    6
 field-queries-ok.chpl:20: warning:   getFieldName    f6
 field-queries-ok.chpl:20: warning:   hasField        true
 field-queries-ok.chpl:20: warning:   getFieldIndex   5
 field-queries-ok.chpl:20: warning:   isFieldBound 5  true
 field-queries-ok.chpl:20: warning:   isFieldBound f6 true
 field-queries-ok.chpl:21: warning: ===== owned CCon
-field-queries-ok.chpl:21: warning:   numFields       6
+field-queries-ok.chpl:21: warning:   getNumFields    6
 field-queries-ok.chpl:21: warning:   getFieldName    f6
 field-queries-ok.chpl:21: warning:   hasField        true
 field-queries-ok.chpl:21: warning:   getFieldIndex   5
 field-queries-ok.chpl:21: warning:   isFieldBound 5  true
 field-queries-ok.chpl:21: warning:   isFieldBound f6 true
 field-queries-ok.chpl:22: warning: ===== owned CCon?
-field-queries-ok.chpl:22: warning:   numFields       6
+field-queries-ok.chpl:22: warning:   getNumFields    6
 field-queries-ok.chpl:22: warning:   getFieldName    f6
 field-queries-ok.chpl:22: warning:   hasField        true
 field-queries-ok.chpl:22: warning:   getFieldIndex   5
 field-queries-ok.chpl:22: warning:   isFieldBound 5  true
 field-queries-ok.chpl:22: warning:   isFieldBound f6 true
 field-queries-ok.chpl:23: warning: ===== shared CCon
-field-queries-ok.chpl:23: warning:   numFields       6
+field-queries-ok.chpl:23: warning:   getNumFields    6
 field-queries-ok.chpl:23: warning:   getFieldName    f6
 field-queries-ok.chpl:23: warning:   hasField        true
 field-queries-ok.chpl:23: warning:   getFieldIndex   5
 field-queries-ok.chpl:23: warning:   isFieldBound 5  true
 field-queries-ok.chpl:23: warning:   isFieldBound f6 true
 field-queries-ok.chpl:24: warning: ===== shared CCon?
-field-queries-ok.chpl:24: warning:   numFields       6
+field-queries-ok.chpl:24: warning:   getNumFields    6
 field-queries-ok.chpl:24: warning:   getFieldName    f6
 field-queries-ok.chpl:24: warning:   hasField        true
 field-queries-ok.chpl:24: warning:   getFieldIndex   5
 field-queries-ok.chpl:24: warning:   isFieldBound 5  true
 field-queries-ok.chpl:24: warning:   isFieldBound f6 true
 field-queries-ok.chpl:25: warning: ===== borrowed CCon
-field-queries-ok.chpl:25: warning:   numFields       6
+field-queries-ok.chpl:25: warning:   getNumFields    6
 field-queries-ok.chpl:25: warning:   getFieldName    f6
 field-queries-ok.chpl:25: warning:   hasField        true
 field-queries-ok.chpl:25: warning:   getFieldIndex   5
 field-queries-ok.chpl:25: warning:   isFieldBound 5  true
 field-queries-ok.chpl:25: warning:   isFieldBound f6 true
 field-queries-ok.chpl:26: warning: ===== borrowed CCon?
-field-queries-ok.chpl:26: warning:   numFields       6
+field-queries-ok.chpl:26: warning:   getNumFields    6
 field-queries-ok.chpl:26: warning:   getFieldName    f6
 field-queries-ok.chpl:26: warning:   hasField        true
 field-queries-ok.chpl:26: warning:   getFieldIndex   5
 field-queries-ok.chpl:26: warning:   isFieldBound 5  true
 field-queries-ok.chpl:26: warning:   isFieldBound f6 true
 field-queries-ok.chpl:27: warning: ===== unmanaged CCon
-field-queries-ok.chpl:27: warning:   numFields       6
+field-queries-ok.chpl:27: warning:   getNumFields    6
 field-queries-ok.chpl:27: warning:   getFieldName    f6
 field-queries-ok.chpl:27: warning:   hasField        true
 field-queries-ok.chpl:27: warning:   getFieldIndex   5
 field-queries-ok.chpl:27: warning:   isFieldBound 5  true
 field-queries-ok.chpl:27: warning:   isFieldBound f6 true
 field-queries-ok.chpl:28: warning: ===== unmanaged CCon?
-field-queries-ok.chpl:28: warning:   numFields       6
+field-queries-ok.chpl:28: warning:   getNumFields    6
 field-queries-ok.chpl:28: warning:   getFieldName    f6
 field-queries-ok.chpl:28: warning:   hasField        true
 field-queries-ok.chpl:28: warning:   getFieldIndex   5
 field-queries-ok.chpl:28: warning:   isFieldBound 5  true
 field-queries-ok.chpl:28: warning:   isFieldBound f6 true
 field-queries-ok.chpl:35: warning: ===== CGen
-field-queries-ok.chpl:35: warning:   numFields       6
+field-queries-ok.chpl:35: warning:   getNumFields    6
 field-queries-ok.chpl:35: warning:   getFieldName    f6
 field-queries-ok.chpl:35: warning:   hasField        true
 field-queries-ok.chpl:35: warning:   getFieldIndex   5
 field-queries-ok.chpl:35: warning:   isFieldBound 5  false
 field-queries-ok.chpl:35: warning:   isFieldBound f6 false
 field-queries-ok.chpl:36: warning: ===== owned CGen
-field-queries-ok.chpl:36: warning:   numFields       6
+field-queries-ok.chpl:36: warning:   getNumFields    6
 field-queries-ok.chpl:36: warning:   getFieldName    f6
 field-queries-ok.chpl:36: warning:   hasField        true
 field-queries-ok.chpl:36: warning:   getFieldIndex   5
 field-queries-ok.chpl:36: warning:   isFieldBound 5  false
 field-queries-ok.chpl:36: warning:   isFieldBound f6 false
 field-queries-ok.chpl:37: warning: ===== owned CGen?
-field-queries-ok.chpl:37: warning:   numFields       6
+field-queries-ok.chpl:37: warning:   getNumFields    6
 field-queries-ok.chpl:37: warning:   getFieldName    f6
 field-queries-ok.chpl:37: warning:   hasField        true
 field-queries-ok.chpl:37: warning:   getFieldIndex   5
 field-queries-ok.chpl:37: warning:   isFieldBound 5  false
 field-queries-ok.chpl:37: warning:   isFieldBound f6 false
 field-queries-ok.chpl:38: warning: ===== shared CGen
-field-queries-ok.chpl:38: warning:   numFields       6
+field-queries-ok.chpl:38: warning:   getNumFields    6
 field-queries-ok.chpl:38: warning:   getFieldName    f6
 field-queries-ok.chpl:38: warning:   hasField        true
 field-queries-ok.chpl:38: warning:   getFieldIndex   5
 field-queries-ok.chpl:38: warning:   isFieldBound 5  false
 field-queries-ok.chpl:38: warning:   isFieldBound f6 false
 field-queries-ok.chpl:39: warning: ===== shared CGen?
-field-queries-ok.chpl:39: warning:   numFields       6
+field-queries-ok.chpl:39: warning:   getNumFields    6
 field-queries-ok.chpl:39: warning:   getFieldName    f6
 field-queries-ok.chpl:39: warning:   hasField        true
 field-queries-ok.chpl:39: warning:   getFieldIndex   5
 field-queries-ok.chpl:39: warning:   isFieldBound 5  false
 field-queries-ok.chpl:39: warning:   isFieldBound f6 false
 field-queries-ok.chpl:40: warning: ===== borrowed CGen
-field-queries-ok.chpl:40: warning:   numFields       6
+field-queries-ok.chpl:40: warning:   getNumFields    6
 field-queries-ok.chpl:40: warning:   getFieldName    f6
 field-queries-ok.chpl:40: warning:   hasField        true
 field-queries-ok.chpl:40: warning:   getFieldIndex   5
 field-queries-ok.chpl:40: warning:   isFieldBound 5  false
 field-queries-ok.chpl:40: warning:   isFieldBound f6 false
 field-queries-ok.chpl:41: warning: ===== borrowed CGen?
-field-queries-ok.chpl:41: warning:   numFields       6
+field-queries-ok.chpl:41: warning:   getNumFields    6
 field-queries-ok.chpl:41: warning:   getFieldName    f6
 field-queries-ok.chpl:41: warning:   hasField        true
 field-queries-ok.chpl:41: warning:   getFieldIndex   5
 field-queries-ok.chpl:41: warning:   isFieldBound 5  false
 field-queries-ok.chpl:41: warning:   isFieldBound f6 false
 field-queries-ok.chpl:42: warning: ===== unmanaged CGen
-field-queries-ok.chpl:42: warning:   numFields       6
+field-queries-ok.chpl:42: warning:   getNumFields    6
 field-queries-ok.chpl:42: warning:   getFieldName    f6
 field-queries-ok.chpl:42: warning:   hasField        true
 field-queries-ok.chpl:42: warning:   getFieldIndex   5
 field-queries-ok.chpl:42: warning:   isFieldBound 5  false
 field-queries-ok.chpl:42: warning:   isFieldBound f6 false
 field-queries-ok.chpl:43: warning: ===== unmanaged CGen?
-field-queries-ok.chpl:43: warning:   numFields       6
+field-queries-ok.chpl:43: warning:   getNumFields    6
 field-queries-ok.chpl:43: warning:   getFieldName    f6
 field-queries-ok.chpl:43: warning:   hasField        true
 field-queries-ok.chpl:43: warning:   getFieldIndex   5
 field-queries-ok.chpl:43: warning:   isFieldBound 5  false
 field-queries-ok.chpl:43: warning:   isFieldBound f6 false
 field-queries-ok.chpl:50: warning: ===== RCon
-field-queries-ok.chpl:50: warning:   numFields       6
+field-queries-ok.chpl:50: warning:   getNumFields    6
 field-queries-ok.chpl:50: warning:   getFieldName    f6
 field-queries-ok.chpl:50: warning:   hasField        true
 field-queries-ok.chpl:50: warning:   getFieldIndex   5
 field-queries-ok.chpl:50: warning:   isFieldBound 5  true
 field-queries-ok.chpl:50: warning:   isFieldBound f6 true
 field-queries-ok.chpl:57: warning: ===== RGen
-field-queries-ok.chpl:57: warning:   numFields       6
+field-queries-ok.chpl:57: warning:   getNumFields    6
 field-queries-ok.chpl:57: warning:   getFieldName    f6
 field-queries-ok.chpl:57: warning:   hasField        true
 field-queries-ok.chpl:57: warning:   getFieldIndex   5
 field-queries-ok.chpl:57: warning:   isFieldBound 5  false
 field-queries-ok.chpl:57: warning:   isFieldBound f6 false
 field-queries-ok.chpl:64: warning: ===== UCon
-field-queries-ok.chpl:64: warning:   numFields       6
+field-queries-ok.chpl:64: warning:   getNumFields    6
 field-queries-ok.chpl:64: warning:   getFieldName    f6
 field-queries-ok.chpl:64: warning:   hasField        true
 field-queries-ok.chpl:64: warning:   getFieldIndex   5
 field-queries-ok.chpl:64: warning:   isFieldBound 5  true
 field-queries-ok.chpl:64: warning:   isFieldBound f6 true
 field-queries-ok.chpl:71: warning: ===== UGen
-field-queries-ok.chpl:71: warning:   numFields       6
+field-queries-ok.chpl:71: warning:   getNumFields    6
 field-queries-ok.chpl:71: warning:   getFieldName    f6
 field-queries-ok.chpl:71: warning:   hasField        true
 field-queries-ok.chpl:71: warning:   getFieldIndex   5
diff --git a/test/library/standard/Reflection/fielderator-concrete.chpl b/test/library/standard/Reflection/fielderator-concrete.chpl
index 54440e78d4ee..0d07e40eab14 100644
--- a/test/library/standard/Reflection/fielderator-concrete.chpl
+++ b/test/library/standard/Reflection/fielderator-concrete.chpl
@@ -1,7 +1,7 @@
 use Reflection;
 
 proc parse(ref data: ?t) {
-  param numfield = numFields(t);
+  param numfield = getNumFields(t);
   for param i in 0..<numfield {
     type vtype = getField(data, i).type;
     writeln(getFieldName(t, i));
diff --git a/test/library/standard/Reflection/fielderator-generic.chpl b/test/library/standard/Reflection/fielderator-generic.chpl
index f2a865a97c46..a553383cc8e1 100644
--- a/test/library/standard/Reflection/fielderator-generic.chpl
+++ b/test/library/standard/Reflection/fielderator-generic.chpl
@@ -1,7 +1,7 @@
 use Reflection;
 
 proc parse(ref data: ?t) {
-  param numfield = numFields(t);
+  param numfield = getNumFields(t);
   for param i in 0..<numfield {
     type vtype = if isType(getField(data, i)) then getField(data, i)
                                               else getField(data, i).type;
diff --git a/test/library/standard/Reflection/getField-managed.chpl b/test/library/standard/Reflection/getField-managed.chpl
index 0a3d38d84d62..2663236ca6b8 100644
--- a/test/library/standard/Reflection/getField-managed.chpl
+++ b/test/library/standard/Reflection/getField-managed.chpl
@@ -1,7 +1,7 @@
 use Reflection;
 proc test(in obj) {
   writeln("===== ", obj.type:string);
-  writeln("  numFields       ", numFields(obj.type)            :string);
+  writeln("  getNumFields    ", getNumFields(obj.type)         :string);
   writeln("  getFieldName    ", getFieldName(obj.type, 5)             );
   writeln("  getField        ", getField(obj, 5)               :string);
   writeln("  getFieldRef     ", getFieldRef(obj, 5)             :string);
diff --git a/test/library/standard/Reflection/getField-managed.good b/test/library/standard/Reflection/getField-managed.good
index 5d850e1e538f..d0beac2117c9 100644
--- a/test/library/standard/Reflection/getField-managed.good
+++ b/test/library/standard/Reflection/getField-managed.good
@@ -1,5 +1,5 @@
 ===== owned CCon
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -8,7 +8,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== owned CCon?
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -17,7 +17,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== shared CCon
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -26,7 +26,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== shared CCon?
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -35,7 +35,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== borrowed CCon
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -44,7 +44,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== borrowed CCon?
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -53,7 +53,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== unmanaged CCon
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -62,7 +62,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== unmanaged CCon?
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -71,7 +71,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== borrowed CCon
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -80,7 +80,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== borrowed CCon?
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
@@ -89,7 +89,7 @@
   isFieldBound 5  true
   isFieldBound f6 true
 ===== RCon
-  numFields       6
+  getNumFields    6
   getFieldName    f6
   getField        17
   getFieldRef     17
diff --git a/test/library/standard/Reflection/reflectOnTypesParams.chpl b/test/library/standard/Reflection/reflectOnTypesParams.chpl
index 04ccb50aa70a..62e4fb91dc40 100644
--- a/test/library/standard/Reflection/reflectOnTypesParams.chpl
+++ b/test/library/standard/Reflection/reflectOnTypesParams.chpl
@@ -8,7 +8,7 @@ record R {
 
 var r = new R();
 
-for param i in 0..<numFields(r.type) {
+for param i in 0..<getNumFields(r.type) {
   if isParam(getField(r, i)) {
     param f = getField(r,i);
     writeln("field ", i, " = ", f, " is a param");
@@ -21,7 +21,7 @@ for param i in 0..<numFields(r.type) {
   }
 }
 
-for param i in 0..<numFields(r.type) {
+for param i in 0..<getNumFields(r.type) {
   param fName = getFieldName(R, i);
   if isParam(getField(r, fName)) {
     param f = getField(r, fName);
diff --git a/test/llvm/alignment/check-align-padding.chpl b/test/llvm/alignment/check-align-padding.chpl
index 73707a0cf4be..4e5060894c04 100644
--- a/test/llvm/alignment/check-align-padding.chpl
+++ b/test/llvm/alignment/check-align-padding.chpl
@@ -52,7 +52,7 @@ extern proc getOffset(const ref base, const ref field): int(64);
 
 proc printFieldOffsets(ref base: ?t) {
   use Reflection;
-  for param i in 0..numFields(t)-1 {
+  for param i in 0..getNumFields(t)-1 {
     writeln(getFieldName(base.type, i), ": ", getField(base, i).type:string, " = ", getOffset(base, getField(base, i)));
   }
 }
diff --git a/test/param/bharshbarg/refToGetFieldType.chpl b/test/param/bharshbarg/refToGetFieldType.chpl
index 674a2a8d3278..a7b2449d2a24 100644
--- a/test/param/bharshbarg/refToGetFieldType.chpl
+++ b/test/param/bharshbarg/refToGetFieldType.chpl
@@ -14,7 +14,7 @@ const x = new R(int, real, 42);
 const ref q = x.A;
 writeln("q = ", q);
 
-for param i in 0..<numFields(x.type) {
+for param i in 0..<getNumFields(x.type) {
   param name = getFieldName(x.type, i);
   const ref val = getField(x, i);
 
diff --git a/test/param/ferguson/fielderator-user-class.chpl b/test/param/ferguson/fielderator-user-class.chpl
index 5d713420ab6c..a0e9198349e8 100644
--- a/test/param/ferguson/fielderator-user-class.chpl
+++ b/test/param/ferguson/fielderator-user-class.chpl
@@ -6,7 +6,7 @@ class R {
 }
 
 
-assert(numFields(R) == 2);
+assert(getNumFields(R) == 2);
 assert(getFieldName(R, 0) == "x");
 
 assert(getFieldIndex(R, "x") == 0);
diff --git a/test/param/ferguson/fielderator-user.chpl b/test/param/ferguson/fielderator-user.chpl
index 79e89a488d53..68c52b03d981 100644
--- a/test/param/ferguson/fielderator-user.chpl
+++ b/test/param/ferguson/fielderator-user.chpl
@@ -6,7 +6,7 @@ record R {
 }
 
 
-assert(numFields(R) == 2);
+assert(getNumFields(R) == 2);
 assert(getFieldName(R, 0) == "x");
 
 assert(getFieldIndex(R, "x") == 0);
diff --git a/test/types/partial/isFieldBound.chpl b/test/types/partial/isFieldBound.chpl
index 20b9170e2a7e..c2f612c33d1b 100644
--- a/test/types/partial/isFieldBound.chpl
+++ b/test/types/partial/isFieldBound.chpl
@@ -11,7 +11,7 @@ record R {
 proc main() {
   type T = R(int, U=real, ?);
 
-  for param i in 0..<numFields(T) {
+  for param i in 0..<getNumFields(T) {
     param name = getFieldName(T, i);
     writeln("T.", name, ": ", isFieldBound(T, name));
   }
diff --git a/test/unstable/ReflectionUnstable.chpl b/test/unstable/ReflectionUnstable.chpl
new file mode 100644
index 000000000000..dd161e03d494
--- /dev/null
+++ b/test/unstable/ReflectionUnstable.chpl
@@ -0,0 +1,28 @@
+use Reflection;
+
+record rec {
+  var f = 0;
+  proc foo() {}
+  proc bar(x: int) {}
+  proc type baz() {}
+  proc type ding(x: int) {}
+}
+
+proc foo() {}
+proc bar(x: int) {}
+
+proc main() {
+  use List;
+  type T = list(int, ?);
+  assert(!isFieldBound(T, "parSafe"));
+  assert(!isFieldBound(T, 1));
+  assert(canResolve("foo"));
+  assert(canResolve("bar", 0));
+  var r = new rec();
+  assert(canResolveMethod(r, "foo"));
+  assert(canResolveMethod(r, "bar", 0));
+  assert(canResolveTypeMethod(rec, "baz"));
+  assert(canResolveTypeMethod(rec, "ding", 0));
+  getFieldRef(r, "f");
+  getFieldRef(r, 0);
+}
diff --git a/test/unstable/ReflectionUnstable.good b/test/unstable/ReflectionUnstable.good
new file mode 100644
index 000000000000..21c389c3c414
--- /dev/null
+++ b/test/unstable/ReflectionUnstable.good
@@ -0,0 +1,11 @@
+ReflectionUnstable.chpl:14: In function 'main':
+ReflectionUnstable.chpl:17: warning: 'isFieldBound' is unstable - consider using 'T.fieldName != ?' syntax instead
+ReflectionUnstable.chpl:18: warning: 'isFieldBound' is unstable - consider using 'T.fieldName != ?' syntax instead
+ReflectionUnstable.chpl:19: warning: The 'canResolve...' family of procedures are unstable
+ReflectionUnstable.chpl:20: warning: The 'canResolve...' family of procedures are unstable
+ReflectionUnstable.chpl:22: warning: The 'canResolve...' family of procedures are unstable
+ReflectionUnstable.chpl:23: warning: The 'canResolve...' family of procedures are unstable
+ReflectionUnstable.chpl:24: warning: The 'canResolve...' family of procedures are unstable
+ReflectionUnstable.chpl:25: warning: The 'canResolve...' family of procedures are unstable
+ReflectionUnstable.chpl:26: warning: 'getFieldRef' is unstable
+ReflectionUnstable.chpl:27: warning: 'getFieldRef' is unstable