Index: tests/zombies/gc_no_raii/premake4.lua
===================================================================
--- tests/zombies/gc_no_raii/premake4.lua	(revision 55266c71e1748ef567376ebf1113f255ed1eed9d)
+++ tests/zombies/gc_no_raii/premake4.lua	(revision 2fa0237f52bd8db42015c83dee0d38191a902db4)
@@ -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 55266c71e1748ef567376ebf1113f255ed1eed9d)
+++ tests/zombies/hashtable.cfa	(revision 2fa0237f52bd8db42015c83dee0d38191a902db4)
@@ -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 55266c71e1748ef567376ebf1113f255ed1eed9d)
+++ tests/zombies/hashtable2.cfa	(revision 2fa0237f52bd8db42015c83dee0d38191a902db4)
@@ -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 55266c71e1748ef567376ebf1113f255ed1eed9d)
+++ tests/zombies/linked-list-perf/experiment.koad	(revision 2fa0237f52bd8db42015c83dee0d38191a902db4)
@@ -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