Index: tests/array-container/array-basic.cfa
===================================================================
--- tests/array-container/array-basic.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/array-container/array-basic.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,3 +1,3 @@
-#include <containers/array.hfa>
+#include <collections/array.hfa>
 
 //
Index: tests/array-container/array-md-sbscr-cases.cfa
===================================================================
--- tests/array-container/array-md-sbscr-cases.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/array-container/array-md-sbscr-cases.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,3 +1,3 @@
-#include <containers/array.hfa>
+#include <collections/array.hfa>
 
 #include <assert.h>
Index: tests/array-container/array-sbscr-types.cfa
===================================================================
--- tests/array-container/array-sbscr-types.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/array-container/array-sbscr-types.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,3 +1,3 @@
-#include <containers/array.hfa>
+#include <collections/array.hfa>
 
 // Shows support for many required ways a user can index into a new array.
Index: tests/array-container/dimexpr-match-cfa.cfa
===================================================================
--- tests/array-container/dimexpr-match-cfa.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/array-container/dimexpr-match-cfa.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -9,10 +9,10 @@
 #ifdef INCLUDE_MINIMAL
 #define POUNDINCLUDE #include
-POUNDINCLUDE <containers/array.hfa>
+POUNDINCLUDE <collections/array.hfa>
 #else
-#include <containers/array.hfa>                           // part of SUT
+#include <collections/array.hfa>						// part of SUT
 #endif
 
-#include "dimexpr-match.hfa"                              // test framework
+#include "dimexpr-match.hfa"							// test framework
 
 // CFA "classic" behaviour is inconsistent between "C array" and "new array."
Index: tests/array-container/safety-summary.cfa
===================================================================
--- tests/array-container/safety-summary.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/array-container/safety-summary.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,5 +1,5 @@
 // A simple, isolated, example of what the dimexpr-match cases are all about.
 
-#include <containers/array.hfa>
+#include <collections/array.hfa>
 
 // context excerpted from doc/theses/mike_brooks_MMath/programs/hello-array.cfa
Index: tests/collections/atomic_mpsc.cfa
===================================================================
--- tests/collections/atomic_mpsc.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/collections/atomic_mpsc.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,4 +1,4 @@
 #include <fstream.hfa>
-#include <containers/lockfree.hfa>
+#include <collections/lockfree.hfa>
 #include <thread.hfa>
 
Index: tests/collections/string-api-coverage.cfa
===================================================================
--- tests/collections/string-api-coverage.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/collections/string-api-coverage.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,3 +1,3 @@
-#include <containers/string.hfa>
+#include <collections/string.hfa>
 #include <string_sharectx.hfa>
 
Index: tests/collections/string-istream.cfa
===================================================================
--- tests/collections/string-istream.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/collections/string-istream.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,5 +1,5 @@
 #include <iostream.hfa>
-#include <containers/string.hfa>
-#include <containers/string_res.hfa>
+#include <collections/string.hfa>
+#include <collections/string_res.hfa>
 
 
Index: tests/collections/string-overwrite.cfa
===================================================================
--- tests/collections/string-overwrite.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/collections/string-overwrite.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,3 +1,3 @@
-#include <containers/string.hfa>
+#include <collections/string.hfa>
 #include <string_sharectx.hfa>
 
Index: tests/collections/vector-demo.cfa
===================================================================
--- tests/collections/vector-demo.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/collections/vector-demo.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,3 +1,3 @@
-#include <containers/vector2.hfa>
+#include <collections/vector2.hfa>
 
 void raiiTests() {
Index: tests/concurrency/unified_locking/thread_test.cfa
===================================================================
--- tests/concurrency/unified_locking/thread_test.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/concurrency/unified_locking/thread_test.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -3,5 +3,5 @@
 #include <stdlib.hfa>
 #include <thread.hfa>
-#include <containers/array.hfa>
+#include <collections/array.hfa>
 
 static unsigned int taskCount = 4;
Index: tests/include/vector-containers.cfa
===================================================================
--- tests/include/vector-containers.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/include/vector-containers.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,4 +1,4 @@
 #include <vector.hfa>
-#include <bits/containers.hfa>
+#include <bits/collections.hfa>
 
 int main() {
Index: tests/list/dlist-insert-remove.cfa
===================================================================
--- tests/list/dlist-insert-remove.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/list/dlist-insert-remove.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,3 +1,3 @@
-#include <containers/list.hfa>
+#include <collections/list.hfa>
 #include <fstream.hfa>
 #include <assert.h>
Index: tests/maybe.cfa
===================================================================
--- tests/maybe.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/maybe.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -10,10 +10,10 @@
 // Created On       : Thr May 25 16:02:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep 25 15:13:28 2020
-// Update Count     : 2
+// Last Modified On : Wed Aug 30 21:45:27 2023
+// Update Count     : 3
 //
 
 #include <assert.h>
-#include <containers/maybe.hfa>
+#include <collections/maybe.hfa>
 
 void checkPredicates() {
Index: tests/result.cfa
===================================================================
--- tests/result.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/result.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -10,10 +10,10 @@
 // Created On       : Thr May 25 16:50:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep 25 15:22:59 2020
-// Update Count     : 2
+// Last Modified On : Wed Aug 30 21:46:34 2023
+// Update Count     : 3
 //
 
 #include <assert.h>
-#include <containers/result.hfa>
+#include <collections/result.hfa>
 
 void checkPredicates() {
Index: tests/zombies/gc_no_raii/premake4.lua
===================================================================
--- tests/zombies/gc_no_raii/premake4.lua	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/zombies/gc_no_raii/premake4.lua	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -48,5 +48,5 @@
 		linkoptions (linkOptionList)
 		includedirs (includeDirList)
-		files { "src/**.c", "containers/**.c" }
+		files { "src/**.c", "collections/**.c" }
 
 	configuration "debug"
Index: tests/zombies/hashtable.cfa
===================================================================
--- tests/zombies/hashtable.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/zombies/hashtable.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,4 +1,4 @@
 
-#include <containers/list.hfa>
+#include <collections/list.hfa>
 
 #include <exception.hfa>
Index: tests/zombies/hashtable2.cfa
===================================================================
--- tests/zombies/hashtable2.cfa	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/zombies/hashtable2.cfa	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -1,4 +1,4 @@
 
-#include <containers/list.hfa>
+#include <collections/list.hfa>
 
 typedef unsigned int K;
Index: tests/zombies/linked-list-perf/experiment.koad
===================================================================
--- tests/zombies/linked-list-perf/experiment.koad	(revision 329487c0ea7cbc1a3d43ed910b0eec20ca0068bd)
+++ tests/zombies/linked-list-perf/experiment.koad	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
@@ -67,5 +67,5 @@
 #elif defined IMPL_CFA_MIKE_NEW
 
-        #include <containers/list.hfa>
+        #include <collections/list.hfa>
         struct S {
                 int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD