diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
index a6c71ae54e..ac40a10fea 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
@@ -138,7 +138,7 @@ const fieldTypeToComponentMap = {
   attachment: "attachmentfield",
   link: "relationshipfield",
   json: "jsonfield",
-  scannedcode: "codescanner",
+  barcodeqr: "codescanner",
 }
 
 export function makeDatasourceFormComponents(datasource) {
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index a4cddf512f..b7249ad60c 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -261,7 +261,7 @@
     } else {
       return [
         FIELDS.STRING,
-        FIELDS.SCANNEDCODE,
+        FIELDS.BARCODEQR,
         FIELDS.LONGFORM,
         FIELDS.OPTIONS,
         FIELDS.DATETIME,
diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index 4d827b59b5..ea0ce59169 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -125,8 +125,12 @@
       value: FIELDS.ARRAY.type,
     },
     {
-      label: "Scanned Code",
-      value: FIELDS.SCANNEDCODE.type,
+      label: "Barcode/QR",
+      value: FIELDS.BARCODEQR.type,
+    },
+    {
+      label: "Long Form Text",
+      value: FIELDS.LONGFORM.type,
     },
   ]
 </script>
diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index eadaecd8cc..4e9b624f12 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -51,7 +51,7 @@ const componentMap = {
   "field/link": FormFieldSelect,
   "field/array": FormFieldSelect,
   "field/json": FormFieldSelect,
-  "field/scannedcode": FormFieldSelect,
+  "field/barcodeqr": FormFieldSelect,
   // Some validation types are the same as others, so not all types are
   // explicitly listed here. e.g. options uses string validation
   "validation/string": ValidationEditor,
diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
index 81b01b2b77..18653f51a3 100644
--- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
@@ -26,7 +26,7 @@
     let entries = Object.entries(schema ?? {})
 
     let types = []
-    if ((type === "field/options", type === "field/scannedcode")) {
+    if ((type === "field/options", type === "field/barcodeqr")) {
       // allow options to be used on both options and string fields
       types = [type, "field/string"]
     } else {
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 93bb90344e..427e8d80a1 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -8,9 +8,9 @@ export const FIELDS = {
       presence: false,
     },
   },
-  SCANNEDCODE: {
-    name: "Scanned Code",
-    type: "scannedcode",
+  BARCODEQR: {
+    name: "Barcode/QR",
+    type: "barcodeqr",
     constraints: {
       type: "string",
       length: {},
@@ -157,7 +157,7 @@ export const ALLOWABLE_STRING_OPTIONS = [
   FIELDS.STRING,
   FIELDS.OPTIONS,
   FIELDS.LONGFORM,
-  FIELDS.SCANNEDCODE,
+  FIELDS.BARCODEQR,
 ]
 export const ALLOWABLE_STRING_TYPES = ALLOWABLE_STRING_OPTIONS.map(
   opt => opt.type
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 64d90875a7..5b4edc8f85 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3158,7 +3158,7 @@
     ]
   },
   "codescanner": {
-    "name": "Code Scanner",
+    "name": "Barcode/QR Scanner",
     "icon": "Camera",
     "styles": [
       "size"
@@ -3169,7 +3169,7 @@
     ],
     "settings": [
       {
-        "type": "field/scannedcode",
+        "type": "field/barcodeqr",
         "label": "Field",
         "key": "field",
         "required": true
diff --git a/packages/client/src/components/app/forms/CodeScannerField.svelte b/packages/client/src/components/app/forms/CodeScannerField.svelte
index 38eab79dc8..7f7d82f304 100644
--- a/packages/client/src/components/app/forms/CodeScannerField.svelte
+++ b/packages/client/src/components/app/forms/CodeScannerField.svelte
@@ -4,7 +4,7 @@
 
   export let field
   export let label
-  export let type = "scannedcode"
+  export let type = "barcodeqr"
   export let disabled = false
   export let validation
   export let defaultValue = ""
diff --git a/packages/client/src/constants.js b/packages/client/src/constants.js
index bad0c30371..1560552dc4 100644
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@@ -1,6 +1,6 @@
 export const FieldTypes = {
   STRING: "string",
-  SCANNEDCODE: "scannedcode",
+  BARCODEQR: "barcodeqr",
   LONGFORM: "longform",
   OPTIONS: "options",
   NUMBER: "number",
diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js
index 4b54424efa..2a92e87ff8 100644
--- a/packages/server/src/constants/index.js
+++ b/packages/server/src/constants/index.js
@@ -31,7 +31,7 @@ exports.NoEmptyFilterStrings = [
 
 exports.FieldTypes = {
   STRING: "string",
-  SCANNEDCODE: "scannedcode",
+  BARCODEQR: "barcodeqr",
   LONGFORM: "longform",
   OPTIONS: "options",
   NUMBER: "number",
@@ -52,7 +52,7 @@ exports.CanSwitchTypes = [
     exports.FieldTypes.STRING,
     exports.FieldTypes.OPTIONS,
     exports.FieldTypes.LONGFORM,
-    exports.FieldTypes.SCANNEDCODE,
+    exports.FieldTypes.BARCODEQR,
   ],
   [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
 ]
diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts
index 52eb25be9d..02f7ad8718 100644
--- a/packages/server/src/integrations/base/sqlTable.ts
+++ b/packages/server/src/integrations/base/sqlTable.ts
@@ -40,7 +40,7 @@ function generateSchema(
       case FieldTypes.STRING:
       case FieldTypes.OPTIONS:
       case FieldTypes.LONGFORM:
-      case FieldTypes.SCANNEDCODE:
+      case FieldTypes.BARCODEQR:
         schema.text(key)
         break
       case FieldTypes.NUMBER:
diff --git a/packages/server/src/utilities/csvParser.js b/packages/server/src/utilities/csvParser.js
index 08962032b6..09449f6fc1 100644
--- a/packages/server/src/utilities/csvParser.js
+++ b/packages/server/src/utilities/csvParser.js
@@ -4,7 +4,7 @@ const { FieldTypes } = require("../constants")
 const VALIDATORS = {
   [FieldTypes.STRING]: () => true,
   [FieldTypes.OPTIONS]: () => true,
-  [FieldTypes.SCANNEDCODE]: () => true,
+  [FieldTypes.BARCODEQR]: () => true,
   [FieldTypes.NUMBER]: attribute => {
     // allow not to be present
     if (!attribute) {
diff --git a/packages/server/src/utilities/rowProcessor/index.js b/packages/server/src/utilities/rowProcessor/index.js
index b61fbe66e1..91daa1b5a0 100644
--- a/packages/server/src/utilities/rowProcessor/index.js
+++ b/packages/server/src/utilities/rowProcessor/index.js
@@ -48,7 +48,7 @@ const TYPE_TRANSFORM_MAP = {
     [null]: "",
     [undefined]: undefined,
   },
-  [FieldTypes.SCANNEDCODE]: {
+  [FieldTypes.BARCODEQR]: {
     "": "",
     [null]: "",
     [undefined]: undefined,