diff --git a/testsuite/test_0038/data/test.cpp b/testsuite/test_0038/data/test.cpp
index ab6044a954..67d1d224ed 100644
--- a/testsuite/test_0038/data/test.cpp
+++ b/testsuite/test_0038/data/test.cpp
@@ -16,11 +16,11 @@ int main(int argc, char **argv)
     AiSceneLoad(render_universe, "scene.ass", nullptr);
     // load the usd procedural (containing a sphere) in a separate universe
     AtNode *proc_a = AiNode(proc_universe, "usd", "usd_proc_a");
-    AiNodeSetStr(proc_a, "filename", "usd_proc_a.usda");
+    AiNodeSetStr(proc_a, AtString("filename"), AtString("usd_proc_a.usda"));
     // Call the viewport API on the usd procedural, and fill the main universe
     AiProceduralViewport(proc_a, render_universe, AI_PROC_POLYGONS);
     AtNode *proc_b = AiNode(proc_universe, "usd", "usd_proc_b");
-    AiNodeSetStr(proc_b, "filename", "usd_proc_b.usda");
+    AiNodeSetStr(proc_b, AtString("filename"), AtString("usd_proc_b.usda"));
     // Call the viewport API on the usd procedural, and fill the main universe
     AiProceduralViewport(proc_b, render_universe, AI_PROC_BOXES);
 
diff --git a/testsuite/test_0142/data/test.cpp b/testsuite/test_0142/data/test.cpp
index 32cdfb0862..b2377f80f4 100644
--- a/testsuite/test_0142/data/test.cpp
+++ b/testsuite/test_0142/data/test.cpp
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
     overrides += "rel material:binding = </materials/lambert1>\nuniform token orientation = \"rightHanded\"\n";
     overrides += "point3f[] points = [(-0.5, -0.5, 0.5), (0.5, -0.5, 0.5), (-0.5, 0.5, 0.5), (0.5, 0.5, 0.5), (-0.5, 0.5, -0.5), (0.5, 0.5, -0.5), (-0.5, -0.5, -0.5), (0.5, -0.5, -0.5)]\n}\n}";
     AiArraySetStr(array, 0, overrides.c_str());
-    AiNodeSetArray(proc, "overrides", array);
+    AiNodeSetArray(proc, AtString("overrides"), array);
 
     AiProceduralViewport(proc, render_universe, AI_PROC_POLYGONS);
 
diff --git a/testsuite/test_0148/data/test.cpp b/testsuite/test_0148/data/test.cpp
index 3c37180200..396e56bde6 100644
--- a/testsuite/test_0148/data/test.cpp
+++ b/testsuite/test_0148/data/test.cpp
@@ -12,9 +12,9 @@ int main(int argc, char **argv)
     
     AtUniverse *universe = AiUniverse();
     AiSceneLoad(universe, "scene_exported.usda", nullptr);
-    AtNode *mesh = AiNodeLookUpByName(universe, "/root/world/geo/primitive");
+    AtNode *mesh = AiNodeLookUpByName(universe, AtString("/root/world/geo/primitive"));
     if (mesh) {
-        AtArray *nsides = AiNodeGetArray(mesh, "nsides");
+        AtArray *nsides = AiNodeGetArray(mesh, AtString("nsides"));
         if (nsides && AiArrayGetNumElements(nsides) == 2) {
             AiEnd();
             return 0;
diff --git a/testsuite/test_0161/data/test.cpp b/testsuite/test_0161/data/test.cpp
index 4a78ca1faa..b33515375c 100644
--- a/testsuite/test_0161/data/test.cpp
+++ b/testsuite/test_0161/data/test.cpp
@@ -15,12 +15,12 @@ int main(int argc, char **argv)
     AiSceneLoad(render_universe, "scene.ass", nullptr);
     AtUniverse *proc_universe = AiUniverse();
     AtNode *proc = AiNode(proc_universe, "usd", "usd_proc");
-    AiNodeSetStr(proc, "filename", "nested_proc.usda");
+    AiNodeSetStr(proc, AtString("filename"), AtString("nested_proc.usda"));
 
     AiProceduralViewport(proc, render_universe, AI_PROC_POLYGONS);
 
     AtNode *proc2 = AiNode(proc_universe, "usd", "usd_proc2");
-    AiNodeSetStr(proc2, "filename", "cube.usda");
+    AiNodeSetStr(proc2, AtString("filename"), AtString("cube.usda"));
 
     AiProceduralViewport(proc2, render_universe, AI_PROC_POLYGONS);
 
diff --git a/testsuite/test_0162/data/test.cpp b/testsuite/test_0162/data/test.cpp
index 5a345c08dd..052a09c4ef 100644
--- a/testsuite/test_0162/data/test.cpp
+++ b/testsuite/test_0162/data/test.cpp
@@ -18,7 +18,7 @@ int main(int argc, char **argv)
     AiSceneLoad(render_universe, "scene.ass", nullptr);
     AtUniverse *proc_universe = AiUniverse();
     AtNode *proc = AiNode(proc_universe, "usd", "usd_proc");
-    AiNodeSetStr(proc, "filename", "nested_proc.usda");
+    AiNodeSetStr(proc, AtString("filename"), AtString("nested_proc.usda"));
 
     AiProceduralViewport(proc, render_universe, AI_PROC_POINTS, params);
 
diff --git a/testsuite/test_0168/data/test.cpp b/testsuite/test_0168/data/test.cpp
index 78e16df922..f06cbb46a0 100644
--- a/testsuite/test_0168/data/test.cpp
+++ b/testsuite/test_0168/data/test.cpp
@@ -17,7 +17,7 @@ int main(int argc, char **argv)
     AiSceneLoad(render_universe, "scene.ass", nullptr);
     // load the usd procedural (containing a sphere) in a separate universe
     AtNode *proc_a = AiNode(proc_universe, "usd", "my_usd");
-    AiNodeSetStr(proc_a, "filename", "scene.usda");
+    AiNodeSetStr(proc_a, AtString("filename"), AtString("scene.usda"));
     // Call the viewport API on the usd procedural, and fill the main universe
     AiProceduralViewport(proc_a, render_universe, AI_PROC_POLYGONS);