diff --git a/mappings/on_cancel.jsonata b/mappings/on_cancel.jsonata
index 888cce4523b3bffbe7542ebd879f2559b00680a2..8491a8f833710d799fa792cb1ec00cf3b4883208 100644
--- a/mappings/on_cancel.jsonata
+++ b/mappings/on_cancel.jsonata
@@ -33,7 +33,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": code, "name": name, "value": value }[]
+                       "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[]
                 }[],
                 "fulfillments": message.order.fulfillments,
diff --git a/mappings/on_confirm.jsonata b/mappings/on_confirm.jsonata
index 66196449e31a677a4467caca750c516ac7b07ba0..baed15fff5128c54985fab7e678d86cb2df65228 100644
--- a/mappings/on_confirm.jsonata
+++ b/mappings/on_confirm.jsonata
@@ -47,7 +47,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": code, "name": name, "value": value }[]
+                 "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[]
             }[],
                 "fulfillments": message.order.fulfillments,
@@ -60,7 +60,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": code, "name": name, "value": value }[]
+                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[]
         },
         "rawResponse": $includeRawResponse ? $ :{}
diff --git a/mappings/on_init.jsonata b/mappings/on_init.jsonata
index 56b99f6f17105b9286f494893732a76c4837f649..b016e3a9ad5b8ea0bd37ba95c94a797d193f5cd6 100644
--- a/mappings/on_init.jsonata
+++ b/mappings/on_init.jsonata
@@ -50,7 +50,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": code, "name": name, "value": value }[]
+                   "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[],
                     "xinput":$xInput(xinput, $action)
                 }[],
@@ -65,7 +65,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": code, "name": name, "value": value }[]
+                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[]
             }
         },
diff --git a/mappings/on_search.jsonata b/mappings/on_search.jsonata
index 89894050ebdbbf93a88f6289be95c91eb14a0947..f29cf925c271e58cd5ed7e07cc54584fa9e76e89 100644
--- a/mappings/on_search.jsonata
+++ b/mappings/on_search.jsonata
@@ -74,7 +74,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": code, "name": name, "value": value }[]
+                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[],
                     "time": {
                         "duration": time.duration,
diff --git a/mappings/on_select.jsonata b/mappings/on_select.jsonata
index b08137f6945b90554226782d37cebe365a0f7ed8..06c1f6a34bb203e296e67984f291f812e6922802 100644
--- a/mappings/on_select.jsonata
+++ b/mappings/on_select.jsonata
@@ -52,7 +52,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": code, "name": name, "value": value }[]
+                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[]
                 }[],
                 "fulfillments": message.order.fulfillments,
diff --git a/mappings/on_status.jsonata b/mappings/on_status.jsonata
index b8124b0505d678bfa6636416fc6cc39ec6b2e65f..8ffa9df9d567ce495630fd2c22c0e4c86db796cd 100644
--- a/mappings/on_status.jsonata
+++ b/mappings/on_status.jsonata
@@ -55,7 +55,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": code, "name": name, "value": value }[]
+                       "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[]
               }[],
                 "fulfillments": message.order.fulfillments,
@@ -69,7 +69,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
+                       "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                     }[]
             }
         },