diff --git a/partiql-tests-data/eval/ion/primitives/null.ion b/partiql-tests-data/eval/ion/primitives/null.ion
index e26d1b3..a96610b 100644
--- a/partiql-tests-data/eval/ion/primitives/null.ion
+++ b/partiql-tests-data/eval/ion/primitives/null.ion
@@ -8,7 +8,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null
+      output:$ion::null
     }
   },
   {
@@ -20,7 +20,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.bool
+      output:$ion::null.bool
     }
   },
   {
@@ -32,7 +32,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.int
+      output:$ion::null.int
     }
   },
   {
@@ -44,7 +44,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.decimal
+      output:$ion::null.decimal
     }
   },
   {
@@ -56,7 +56,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.string
+      output:$ion::null.string
     }
   },
   {
@@ -68,7 +68,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.symbol
+      output:$ion::null.symbol
     }
   },
   {
@@ -80,7 +80,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.clob
+      output:$ion::null.clob
     }
   },
   {
@@ -92,7 +92,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.blob
+      output:$ion::null.blob
     }
   },
   {
@@ -104,7 +104,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.list
+      output:$ion::null.list
     }
   },
   {
@@ -116,7 +116,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.struct
+      output:$ion::null.struct
     }
   },
   {
@@ -128,7 +128,7 @@
         EvalModeCoerce,
         EvalModeError
       ],
-      output:null.sexp
+      output:$ion::null.sexp
     }
   },
   {
diff --git a/partiql-tests-data/eval/ion/primitives/operators/nary-operators.ion b/partiql-tests-data/eval/ion/primitives/operators/nary-operators.ion
index 7a2d686..3a8f520 100644
--- a/partiql-tests-data/eval/ion/primitives/operators/nary-operators.ion
+++ b/partiql-tests-data/eval/ion/primitives/operators/nary-operators.ion
@@ -7,7 +7,7 @@ envs::{
 nary::[
   {
     name:"equalListDifferentTypesTrue",
-    statement:"[1, 2e0, 'hello'] = [1.0, 2, `hello`]",
+    statement:"[1, 2e0, `hello`] = [1.0, 2, `hello`]",
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
@@ -16,7 +16,7 @@ nary::[
   },
   {
     name:"listDifferentTypesDifferentOrderFalse",
-    statement:"[1, 2e0, 'hello'] = [`hello`, 2, 1.0]",
+    statement:"[1, 2e0, `hello`] = [`hello`, 2, 1.0]",
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
@@ -25,7 +25,7 @@ nary::[
   },
   {
     name:"equalBagDifferentTypesDifferentOrderTrue",
-    statement:"<<1, 2e0, 'hello'>> = <<`hello`, 2, 1.0>>",
+    statement:"<<1, 2e0, `hello`>> = <<`hello`, 2, 1.0>>",
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
@@ -34,7 +34,7 @@ nary::[
   },
   {
     name:"equalBagDifferentTypesWithNullMissingDifferentOrderTrue",
-    statement:"<<1, 2e0, 'hello', NULL, MISSING>> = <<MISSING, NULL, `hello`, 2, 1.0>>",
+    statement:"<<1, 2e0, `hello`, NULL, MISSING>> = <<MISSING, NULL, `hello`, 2, 1.0>>",
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
diff --git a/partiql-tests-data/eval/ion/primitives/symbol.ion b/partiql-tests-data/eval/ion/primitives/symbol.ion
index 3954253..a578a9a 100644
--- a/partiql-tests-data/eval/ion/primitives/symbol.ion
+++ b/partiql-tests-data/eval/ion/primitives/symbol.ion
@@ -8,7 +8,7 @@
         evalMode: EvalModeCoerce,
         output: $bag::[
           {
-          '': 1
+          '': $ion::1
           }
         ]
       },
diff --git a/partiql-tests-data/eval/ion/query/order-by.ion b/partiql-tests-data/eval/ion/query/order-by.ion
index e952b2e..df34985 100644
--- a/partiql-tests-data/eval/ion/query/order-by.ion
+++ b/partiql-tests-data/eval/ion/query/order-by.ion
@@ -6,7 +6,7 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': nan}, {'a': -inf}, {'a': -0.5}, {'a': 5}, {'a': 7}, {'a': 9}, {'a': +inf}]
+      output:[{'a': $ion::nan}, {'a': $ion::-inf}, {'a': -0.5}, {'a': 5}, {'a': 7}, {'a': 9}, {'a': $ion::+inf}]
     }
   },
   // +inf before numeric values then -inf then nan (DESC)
@@ -16,7 +16,7 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': +inf}, {'a': 9}, {'a': 7}, {'a': 5}, {'a': -0.5}, {'a': -inf}, {'a': nan}]
+      output:[{'a': $ion::+inf}, {'a': 9}, {'a': 7}, {'a': 5}, {'a': -0.5}, {'a': $ion::-inf}, {'a': $ion::nan}]
     }
   },
   // text types compared by lexicographical ordering of Unicode scalar (ASC)
@@ -26,7 +26,7 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': '0'}, {'a': '9'}, {'a': 'A'}, {'a': 'Z'}, {'a': 'a'}, {'a': 'z'}, {'a': '\uD83D\uDCA9'}, {'a': "\U0001F4A9"}]
+      output:[{'a': '0'}, {'a': '9'}, {'a': 'A'}, {'a': 'Z'}, {'a': 'a'}, {'a': 'z'}, {'a': $ion::'\uD83D\uDCA9'}, {'a': $ion::"\U0001F4A9"}]
     }
   },
   // text types compared by lexicographical ordering of Unicode scalar (DESC)
@@ -36,7 +36,7 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': '\uD83D\uDCA9'}, {'a': "\U0001F4A9"}, {'a': 'z'}, {'a': 'a'}, {'a': 'Z'}, {'a': 'A'}, {'a': '9'}, {'a': '0'}]
+      output:[{'a': $ion::'\uD83D\uDCA9'}, {'a': $ion::"\U0001F4A9"}, {'a': 'z'}, {'a': 'a'}, {'a': 'Z'}, {'a': 'A'}, {'a': '9'}, {'a': '0'}]
     }
   },
   // LOB types follow their lexicographical ordering by octet (ASC)
@@ -46,7 +46,7 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': {{"A"}}}, {'a': {{"Z"}}}, {'a': {{"a"}}}, {'a': {{"z"}}}]
+      output:[{'a': $ion::{{"A"}}}, {'a': $ion::{{"Z"}}}, {'a': $ion::{{"a"}}}, {'a': $ion::{{"z"}}}]
     }
   },
   // LOB types should ordered (DESC)
@@ -56,7 +56,7 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': {{"z"}}}, {'a': {{"a"}}}, {'a': {{"Z"}}}, {'a': {{"A"}}}]
+      output:[{'a': $ion::{{"z"}}}, {'a': $ion::{{"a"}}}, {'a': $ion::{{"Z"}}}, {'a': $ion::{{"A"}}}]
     }
   },
   // lists items should be ordered by data types (ASC) (nulls last as default for asc)
@@ -66,17 +66,17 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': [true]}, {'a': [1]}, {'a': ["a"]}, {'a': [{{}}]}, {'a': [[]]}, {'a': [{}]}, {'a': [$bag::[]]}, {'a': [null]}]
+      output:[{'a': [true]}, {'a': [1]}, {'a': ["a"]}, {'a': [$ion::{{}}]}, {'a': [[]]}, {'a': [{}]}, {'a': [$bag::[]]}, {'a': [null]}]
     }
   },
   // lists items should be ordered by data types (DESC) (nulls first as default for desc)
   {
     name:"lists items should be ordered by data types (DESC) (nulls first as default for desc)",
-    statement:"SELECT * FROM [{'a': ['a']}, {'a': [1]}, {'a': [true]}, {'a': [null]}, {'a': [{}]}, {'a': [<<>>]}, {'a': [`{{}}`]}, {'a': [[]]} ] ORDER BY a DESC",
+    statement:"SELECT * FROM [{'a': ['a']}, {'a': [1]}, {'a': [true]}, {'a': [null]}, {'a': [{}]}, {'a': [<<>>]}, {'a': [`{{ +AB/ }}`]}, {'a': [[]]} ] ORDER BY a DESC",
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': [null]}, {'a': [$bag::[]]}, {'a': [{}]}, {'a': [[]]}, {'a': [{{}}]}, {'a': ["a"]}, {'a': [1]}, {'a': [true]}]
+      output:[{'a': [null]}, {'a': [$bag::[]]}, {'a': [{}]}, {'a': [[]]}, {'a': [$ion::{{ +AB/ }}]}, {'a': ["a"]}, {'a': [1]}, {'a': [true]}]
     }
   },
   // structs should be ordered by data types (ASC) (nulls last as default for asc)
@@ -86,7 +86,7 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': {'a': true}}, {'a': {'a': 5}}, {'a': {'a': "b"}}, {'a': {'a': {{}}}}, {'a': {'a': []}}, {'a': {'a': {}}}, {'a': {'a': $bag::[]}}, {'a': {'a': null}}]
+      output:[{'a': {'a': true}}, {'a': {'a': 5}}, {'a': {'a': "b"}}, {'a': {'a': $ion::{{}}}}, {'a': {'a': []}}, {'a': {'a': {}}}, {'a': {'a': $bag::[]}}, {'a': {'a': null}}]
     }
   },
   // structs should be ordered by data types (DESC) (nulls first as default for desc)
@@ -96,7 +96,7 @@ edge_cases::[
     assert:{
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
-      output:[{'a': {'a': null}}, {'a': {'a': $bag::[]}}, {'a': {'a': {}}}, {'a': {'a': []}}, {'a': {'a': {{}}}}, {'a': {'a': "b"}}, {'a': {'a': 5}}, {'a': {'a': true}}]
+      output:[{'a': {'a': null}}, {'a': {'a': $bag::[]}}, {'a': {'a': {}}}, {'a': {'a': []}}, {'a': {'a': $ion::{{}}}}, {'a': {'a': "b"}}, {'a': {'a': 5}}, {'a': {'a': true}}]
     }
   },
 ]
diff --git a/partiql-tests-data/eval/ion/query/select/from-clause.ion b/partiql-tests-data/eval/ion/query/select/from-clause.ion
index 1a7e7bd..ef96f3b 100644
--- a/partiql-tests-data/eval/ion/query/select/from-clause.ion
+++ b/partiql-tests-data/eval/ion/query/select/from-clause.ion
@@ -6,9 +6,9 @@
       evalMode:[EvalModeCoerce, EvalModeError],
       result:EvaluationSuccess,
       output:$bag::[
-        a,
-        b,
-        c
+        $ion::a,
+        $ion::b,
+        $ion::c
       ]
     }
   },
diff --git a/partiql-tests-data/eval/ion/query/select/projection.ion b/partiql-tests-data/eval/ion/query/select/projection.ion
index 33b35c3..a3392c2 100644
--- a/partiql-tests-data/eval/ion/query/select/projection.ion
+++ b/partiql-tests-data/eval/ion/query/select/projection.ion
@@ -7,11 +7,11 @@
       result:EvaluationSuccess,
       output:$bag::[
         {
-          _1:(
-            1
-            2
-          )
-        }
+          _1:$ion::1
+        },
+        {
+          _1:$ion::2
+        },
       ]
     }
   },