diff --git a/connect_transformations/formula/mixins.py b/connect_transformations/formula/mixins.py
index 1ff7f24..65c36b4 100644
--- a/connect_transformations/formula/mixins.py
+++ b/connect_transformations/formula/mixins.py
@@ -11,7 +11,12 @@
 from connect.eaas.core.responses import RowTransformationResponse
 
 from connect_transformations.formula.models import Configuration
-from connect_transformations.formula.utils import DROP_REGEX, extract_input, validate_formula
+from connect_transformations.formula.utils import (
+    DROP_REGEX,
+    clear_formula,
+    extract_input,
+    validate_formula,
+)
 from connect_transformations.models import Error, StreamsColumn, ValidationResult
 from connect_transformations.utils import cast_value_to_type, deep_convert_type
 
@@ -30,7 +35,8 @@ def precompile(self, row: Dict):
                 formula = expression['formula']
                 if DROP_REGEX.findall(formula):
                     formula = f'def drop_row: "#INSTRUCTION/DELETE_ROW"; {formula}'
-                self.jq_expressions[expression['to']] = jq.compile(formula)
+                clean_formula = clear_formula(formula)
+                self.jq_expressions[expression['to']] = jq.compile(clean_formula)
 
             self.column_converters = []
 
diff --git a/connect_transformations/formula/utils.py b/connect_transformations/formula/utils.py
index 628016a..84171a4 100644
--- a/connect_transformations/formula/utils.py
+++ b/connect_transformations/formula/utils.py
@@ -4,6 +4,7 @@
 # All rights reserved.
 #
 import re
+from collections import defaultdict
 
 import jq
 from fastapi.responses import JSONResponse
@@ -18,6 +19,7 @@
 
 JQ_FIELDS_REGEX = re.compile(r'(\.([a-z_][a-z0-9_]*))|(\."(.+?)")|(\.\["(.+?)"\])', re.I)
 DROP_REGEX = re.compile(r'(?<![."])drop_row(?![."])', re.I)
+COL_ID_REGEX = re.compile(r'\."([^"]+) \(C\d{3,4}\)"')
 
 
 def validate_formula(data):  # noqa: CCR001
@@ -54,38 +56,22 @@ def validate_formula(data):  # noqa: CCR001
             )
 
     output_columns = []
-    available_columns = {col['name']: col['id'] for col in data['columns']['input']}
+    column_converter = get_expression_column_converter(data['columns']['input'])
 
     for expression in data['settings']['expressions']:
         if expression['to'] in output_columns:
             return build_error_response('Each `output column` must be unique.')
 
-        if expression['to'] in available_columns:
-            output_column = list(filter(
-                lambda col: col['name'] == expression['to'],
-                data['columns']['output'],
-            ))
-            if (
-                len(output_column) != 1
-                or not output_column[0].get('id')
-                or output_column[0]['id'] != available_columns[expression['to']]
-            ):
-                return build_error_response(f'Column `{expression["to"]}` already exists.')
-
-        columns = [
-            r[1] or r[3] or r[5]
-            for r in JQ_FIELDS_REGEX.findall(expression['formula'])
-        ]
-
-        for column in columns:
-            if column not in available_columns:
+        for match in JQ_FIELDS_REGEX.findall(expression['formula']):
+            var_name = match[1] or match[3] or match[5]
+            var = column_converter(var_name)
+            if not var:
                 return build_error_response(
                     (
                         f'Settings contains formula `{expression["formula"]}` '
-                        'with column that does not exist on columns.input.'
+                        f'with column `{var_name}` that does not exist on columns.input.'
                     ),
                 )
-
         try:
             formula = expression['formula']
             if DROP_REGEX.findall(formula):
@@ -121,10 +107,53 @@ def extract_input(data):
             },
         )
 
-    input_columns = set()
+    input_columns = []
+    added_columns = {}
+
+    column_converter = get_expression_column_converter(data['columns'])
+
     for expression in data['expressions']:
-        input_columns.update([
-            r[1] or r[3] or r[5]
-            for r in JQ_FIELDS_REGEX.findall(expression['formula'])
-        ])
-    return [column for column in data['columns'] if column['name'] in input_columns]
+        for match in JQ_FIELDS_REGEX.findall(expression['formula']):
+            col_value = match[1] or match[3] or match[5]
+            col = column_converter(col_value)
+            if not col:
+                return JSONResponse(
+                    status_code=400,
+                    content={
+                        'error': f'{col_value} not found in input columns',
+                    },
+                )
+
+            if col['name'] not in added_columns:
+                input_columns.append(col)
+                added_columns[col['name']] = col['id']
+
+    return input_columns
+
+
+def get_expression_column_converter(columns):
+    cols_by_name = defaultdict(list)
+    cols_by_id = {}
+
+    for column in columns:
+        id_suffix = column['id'].split('-')[-1]
+        cols_by_name[column['name']].append(column)
+        cols_by_id[f'(C{id_suffix})'] = column
+
+    def converter(col_name):
+        if col_name in cols_by_name:
+            return cols_by_name[col_name][-1]
+
+        col_name_parts = col_name.split()
+        if (
+            len(col_name_parts) > 1
+            and col_name_parts[-1] in cols_by_id
+            and cols_by_id[col_name_parts[-1]]['name'] == ' '.join(col_name_parts[:-1])
+        ):
+            return cols_by_id[col_name_parts[-1]]
+
+    return converter
+
+
+def clear_formula(expression):
+    return COL_ID_REGEX.sub(r'."\1"', expression)
diff --git a/connect_transformations/static/transformations/airtable_lookup.36093b636dae3ccdc875.js b/connect_transformations/static/transformations/airtable_lookup.2852161b91d2511b0373.js
similarity index 98%
rename from connect_transformations/static/transformations/airtable_lookup.36093b636dae3ccdc875.js
rename to connect_transformations/static/transformations/airtable_lookup.2852161b91d2511b0373.js
index ecfb44c..9157691 100644
--- a/connect_transformations/static/transformations/airtable_lookup.36093b636dae3ccdc875.js
+++ b/connect_transformations/static/transformations/airtable_lookup.2852161b91d2511b0373.js
@@ -141,6 +141,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/pages/transformations/airtable_lookup.js
 /*
@@ -170,7 +176,7 @@ const createCopyRow = (parent, index, options, input, output) => {
       <select class="list" style="width: 35%;" ${input ? `value="${input.id}"` : ''}>
         ${options.map((column) => `
           <option value="${column.id}" ${input && input.id === column.id ? 'selected' : ''}>
-            ${column.name}
+            ${getColumnLabel(column)}
           </option>`).join(' ')}
       </select>
       <input type="text" placeholder="Copy column name" style="width: 35%;" ${output ? `value="${output.name}"` : ''} />
@@ -428,7 +434,6 @@ const airtable = (app) => {
   .then(airtable);
 
 
-
 /***/ })
 
 /******/ 	});
diff --git a/connect_transformations/static/transformations/airtable_lookup.html b/connect_transformations/static/transformations/airtable_lookup.html
index 8c86d9c..ea03110 100644
--- a/connect_transformations/static/transformations/airtable_lookup.html
+++ b/connect_transformations/static/transformations/airtable_lookup.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Airtable Lookup</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/airtable_lookup.36093b636dae3ccdc875.js"></script><link href="../transformations/airtable_lookup.5f5aa442fc131fcaad2c.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container"><div class="config-elem api-input"><label for="key-select">API Key</label> <input style="width: 86%;" id="key-input" placeholder="Enter an AirTable key"></div><div class="config-elem"><label for="base-select">AirTable Base</label> <select disabled="disabled" class="list" style="width: 80%;" id="base-select"></select></div><div class="config-elem"><label for="table-select">AirTable table name</label> <select disabled="disabled" class="list" style="width: 80%;" id="table-select"></select></div><div class="config-elem"><label for="table-select">Input column (Key)</label> <select disabled="disabled" class="list" style="width: 80%;" id="input-column-select"></select></div><div class="config-elem"><label for="table-select">AirTable Field Name (Key)</label> <select disabled="disabled" class="list" style="width: 80%;" id="field-select"></select></div></div><b>Columns Mapping</b><div id="content"></div><div class="button-container"><button disabled="disabled" id="add" class="button">ADD COLUMN</button></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Airtable Lookup</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/airtable_lookup.2852161b91d2511b0373.js"></script><link href="../transformations/airtable_lookup.5f5aa442fc131fcaad2c.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container"><div class="config-elem api-input"><label for="key-select">API Key</label> <input style="width: 86%;" id="key-input" placeholder="Enter an AirTable key"></div><div class="config-elem"><label for="base-select">AirTable Base</label> <select disabled="disabled" class="list" style="width: 80%;" id="base-select"></select></div><div class="config-elem"><label for="table-select">AirTable table name</label> <select disabled="disabled" class="list" style="width: 80%;" id="table-select"></select></div><div class="config-elem"><label for="table-select">Input column (Key)</label> <select disabled="disabled" class="list" style="width: 80%;" id="input-column-select"></select></div><div class="config-elem"><label for="table-select">AirTable Field Name (Key)</label> <select disabled="disabled" class="list" style="width: 80%;" id="field-select"></select></div></div><b>Columns Mapping</b><div id="content"></div><div class="button-container"><button disabled="disabled" id="add" class="button">ADD COLUMN</button></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/attachment_lookup.ce7b0ca6b8388fab423e.js b/connect_transformations/static/transformations/attachment_lookup.073059714271bc4cd2f6.js
similarity index 98%
rename from connect_transformations/static/transformations/attachment_lookup.ce7b0ca6b8388fab423e.js
rename to connect_transformations/static/transformations/attachment_lookup.073059714271bc4cd2f6.js
index f8bbd58..6c1fbb9 100644
--- a/connect_transformations/static/transformations/attachment_lookup.ce7b0ca6b8388fab423e.js
+++ b/connect_transformations/static/transformations/attachment_lookup.073059714271bc4cd2f6.js
@@ -143,6 +143,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/pages/transformations/attachment_lookup.js
 /*
@@ -177,7 +183,7 @@ const fillSelect = (options, id, value) => {
   options.forEach((item) => {
     const option = document.createElement('option');
     option.value = item.id;
-    option.text = item.name;
+    option.text = getColumnLabel(item);
     if (item.id === value) {
       option.selected = true;
     }
diff --git a/connect_transformations/static/transformations/attachment_lookup.html b/connect_transformations/static/transformations/attachment_lookup.html
index 991d93f..5528030 100644
--- a/connect_transformations/static/transformations/attachment_lookup.html
+++ b/connect_transformations/static/transformations/attachment_lookup.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Attachment Lookup</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/attachment_lookup.ce7b0ca6b8388fab423e.js"></script><link href="../transformations/attachment_lookup.2c9f2595bae22a0caf51.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app" class="hidden"><div class="main-container" id="content"><div class="row"><div class="col"><div class="input-group"><label class="label" for="attachment">Attachment</label> <select materialize id="attachment"></select></div></div><div class="col"><div class="input-group"><label class="label" for="sheet">Sheet</label> <input materialize id="sheet"></div></div></div><div class="row"><div class="col"><div class="input-group"><label class="label" for="input-column">Input Column (Key)</label> <select materialize id="input-column"></select></div></div><div class="col"><div class="input-group"><label class="label" for="attachment-column">Attachment Field name (Key)</label> <input materialize id="attachment-column"></div></div></div><div id="mapping"><div class="subtitle">Columns mapping</div></div></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Attachment Lookup</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/attachment_lookup.073059714271bc4cd2f6.js"></script><link href="../transformations/attachment_lookup.2c9f2595bae22a0caf51.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app" class="hidden"><div class="main-container" id="content"><div class="row"><div class="col"><div class="input-group"><label class="label" for="attachment">Attachment</label> <select materialize id="attachment"></select></div></div><div class="col"><div class="input-group"><label class="label" for="sheet">Sheet</label> <input materialize id="sheet"></div></div></div><div class="row"><div class="col"><div class="input-group"><label class="label" for="input-column">Input Column (Key)</label> <select materialize id="input-column"></select></div></div><div class="col"><div class="input-group"><label class="label" for="attachment-column">Attachment Field name (Key)</label> <input materialize id="attachment-column"></div></div></div><div id="mapping"><div class="subtitle">Columns mapping</div></div></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/copy.1ede3336839fbbe21e63.js b/connect_transformations/static/transformations/copy.3f7e33696135d1752653.js
similarity index 98%
rename from connect_transformations/static/transformations/copy.1ede3336839fbbe21e63.js
rename to connect_transformations/static/transformations/copy.3f7e33696135d1752653.js
index 2597216..ce36551 100644
--- a/connect_transformations/static/transformations/copy.1ede3336839fbbe21e63.js
+++ b/connect_transformations/static/transformations/copy.3f7e33696135d1752653.js
@@ -143,6 +143,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/pages/transformations/copy.js
 /*
@@ -166,7 +172,7 @@ const createCopyRow = (parent, index, options, input, output) => {
       <select class="list" style="width: 35%;" ${input ? `value="${input.id}"` : ''}>
         ${options.map((column) => `
           <option value="${column.id}" ${input && input.id === column.id ? 'selected' : ''}>
-            ${column.name}
+            ${getColumnLabel(column)}
           </option>`).join(' ')}
       </select>
       <input type="text" placeholder="Copy column name" style="width: 35%;" ${output ? `value="${output.name}"` : ''} />
diff --git a/connect_transformations/static/transformations/copy.html b/connect_transformations/static/transformations/copy.html
index f3b3d31..31a6461 100755
--- a/connect_transformations/static/transformations/copy.html
+++ b/connect_transformations/static/transformations/copy.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Copy</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/copy.1ede3336839fbbe21e63.js"></script><link href="../transformations/copy.15f999ee385ccc3cdaea.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app" class="application"><div class="main-container" id="content"></div><div class="button-container"><button id="add" class="button">ADD COLUMN</button></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Copy</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/copy.3f7e33696135d1752653.js"></script><link href="../transformations/copy.15f999ee385ccc3cdaea.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app" class="application"><div class="main-container" id="content"></div><div class="button-container"><button id="add" class="button">ADD COLUMN</button></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/currency_conversion.c112386fe452cc74af5b.js b/connect_transformations/static/transformations/currency_conversion.345ae7ad31b241768362.js
similarity index 97%
rename from connect_transformations/static/transformations/currency_conversion.c112386fe452cc74af5b.js
rename to connect_transformations/static/transformations/currency_conversion.345ae7ad31b241768362.js
index 11daebb..45b69b5 100644
--- a/connect_transformations/static/transformations/currency_conversion.c112386fe452cc74af5b.js
+++ b/connect_transformations/static/transformations/currency_conversion.345ae7ad31b241768362.js
@@ -79,6 +79,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/components.js
 /*
@@ -194,8 +200,8 @@ const convert = (app) => {
 
     columns.forEach(column => {
       const isSelected = settings && column.name === settings.from.column;
-
-      const option = isSelected ? `<option value="${column.id}" selected>${column.name}</option>` : `<option value="${column.id}">${column.name}</option>`;
+      const colLabel = getColumnLabel(column);
+      const option = isSelected ? `<option value="${column.id}" selected>${colLabel}</option>` : `<option value="${column.id}">${colLabel}</option>`;
 
       inputColumnSelect.innerHTML += option;
     });
diff --git a/connect_transformations/static/transformations/currency_conversion.html b/connect_transformations/static/transformations/currency_conversion.html
index f4edc2b..a93030a 100644
--- a/connect_transformations/static/transformations/currency_conversion.html
+++ b/connect_transformations/static/transformations/currency_conversion.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Currency Conversion</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/currency_conversion.c112386fe452cc74af5b.js"></script><link href="../transformations/currency_conversion.15f999ee385ccc3cdaea.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"><form name="convertCurrency" class="convert-currency"><div class="convert-currency__input-group"><div class="convert-currency__column convert-currency__input"><label for="input-column">Input Column</label> <select name="inputColumn" id="input-column"></select></div><div class="convert-currency__input"><label for="from-currency">From Currency</label> <select name="fromCurrency" id="from-currency"></select></div></div><div class="convert-currency__input-group"><div class="convert-currency__column convert-currency__input"><label for="output-column">Output Column</label> <input name="outputColumn" id="output-column"></div><div class="convert-currency__input"><label for="to-currency">To Currency</label> <select name="toCurrency" id="to-currency"></select></div></div></form></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Currency Conversion</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/currency_conversion.345ae7ad31b241768362.js"></script><link href="../transformations/currency_conversion.15f999ee385ccc3cdaea.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"><form name="convertCurrency" class="convert-currency"><div class="convert-currency__input-group"><div class="convert-currency__column convert-currency__input"><label for="input-column">Input Column</label> <select name="inputColumn" id="input-column"></select></div><div class="convert-currency__input"><label for="from-currency">From Currency</label> <select name="fromCurrency" id="from-currency"></select></div></div><div class="convert-currency__input-group"><div class="convert-currency__column convert-currency__input"><label for="output-column">Output Column</label> <input name="outputColumn" id="output-column"></div><div class="convert-currency__input"><label for="to-currency">To Currency</label> <select name="toCurrency" id="to-currency"></select></div></div></form></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/filter_row.97891e81a14862909dfb.js b/connect_transformations/static/transformations/filter_row.348ec003c725618baa08.js
similarity index 97%
rename from connect_transformations/static/transformations/filter_row.97891e81a14862909dfb.js
rename to connect_transformations/static/transformations/filter_row.348ec003c725618baa08.js
index 2393d00..7feca74 100644
--- a/connect_transformations/static/transformations/filter_row.97891e81a14862909dfb.js
+++ b/connect_transformations/static/transformations/filter_row.348ec003c725618baa08.js
@@ -143,6 +143,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/pages/transformations/filter_row.js
 /*
@@ -199,7 +205,7 @@ const filterRow = (app) => {
     availableColumns.forEach((column) => {
       const option = document.createElement('option');
       option.value = column.id;
-      option.text = column.name;
+      option.text = getColumnLabel(column);
       document.getElementById('column').appendChild(option);
     });
 
@@ -247,13 +253,12 @@ const filterRow = (app) => {
     hideComponent('app');
 
     const inputSelector = document.getElementById('column');
-    const selectedColumn = inputSelector.options[inputSelector.selectedIndex].text;
     const inputColumn = columns.find((column) => column.id === inputSelector.value);
     const matchCondition = document.getElementById('match').checked;
     data.columns.input.push(inputColumn);
     data.columns.output.push(
       {
-        name: `${selectedColumn}_INSTRUCTIONS`,
+        name: `${inputColumn.name}_INSTRUCTIONS`,
         type: 'string',
         output: false,
       },
@@ -261,7 +266,7 @@ const filterRow = (app) => {
 
     const inputValue = document.getElementById('value');
     data.settings = {
-      from: selectedColumn,
+      from: inputColumn.name,
       value: inputValue.value,
       match_condition: matchCondition,
       additional_values: [],
diff --git a/connect_transformations/static/transformations/filter_row.html b/connect_transformations/static/transformations/filter_row.html
index ad35033..2c93583 100644
--- a/connect_transformations/static/transformations/filter_row.html
+++ b/connect_transformations/static/transformations/filter_row.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Filter Row</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/filter_row.97891e81a14862909dfb.js"></script><link href="../transformations/filter_row.9e2b7d8cadaada9f8c93.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"><div class="input-group"><label class="label" for="column">Input Column</label> <select class="input" id="column"></select></div><div class="input-group"><label class="label" for="value">Value</label> <input id="value" class="input" placeholder="Value"/></div></div><div class="button-container"><button id="add" class="button">ADD VALUE</button></div><div class="input-group"><p class="radio-buttons">How to filter rows by condition:</p><div class="radio-buttons"><input type="radio" id="match" name="filter_condition" value="match"/> <label class="label" for="match">By match</label> <input type="radio" id="mismatch" name="filter_condition" value="mismatch"/> <label class="label" for="mismatch">By mismatch</label></div></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Filter Row</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/filter_row.348ec003c725618baa08.js"></script><link href="../transformations/filter_row.9e2b7d8cadaada9f8c93.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"><div class="input-group"><label class="label" for="column">Input Column</label> <select class="input" id="column"></select></div><div class="input-group"><label class="label" for="value">Value</label> <input id="value" class="input" placeholder="Value"/></div></div><div class="button-container"><button id="add" class="button">ADD VALUE</button></div><div class="input-group"><p class="radio-buttons">How to filter rows by condition:</p><div class="radio-buttons"><input type="radio" id="match" name="filter_condition" value="match"/> <label class="label" for="match">By match</label> <input type="radio" id="mismatch" name="filter_condition" value="mismatch"/> <label class="label" for="mismatch">By mismatch</label></div></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/formula.7e06ea00eb29f0f8219a.js b/connect_transformations/static/transformations/formula.9c406fdcdf9b7c4c43cc.js
similarity index 98%
rename from connect_transformations/static/transformations/formula.7e06ea00eb29f0f8219a.js
rename to connect_transformations/static/transformations/formula.9c406fdcdf9b7c4c43cc.js
index 4d6b405..05bdc8e 100644
--- a/connect_transformations/static/transformations/formula.7e06ea00eb29f0f8219a.js
+++ b/connect_transformations/static/transformations/formula.9c406fdcdf9b7c4c43cc.js
@@ -440,6 +440,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/components.js
 /*
@@ -635,11 +641,11 @@ const formula = (app) => {
     /* eslint-disable-next-line */
     const pattern = /[ .,|*:;{}[\]+\/%]/;
     suggestor = { '.': availableColumns.map(col => {
-      const needsQuotes = pattern.test(col.name);
+      const colLabel = getColumnLabel(col);
 
       return {
-        title: col.name,
-        value: needsQuotes ? `."${col.name}"` : `.${col.name}`,
+        title: colLabel,
+        value: `."${colLabel}"`,
       };
     }) };
 
diff --git a/connect_transformations/static/transformations/formula.html b/connect_transformations/static/transformations/formula.html
index d2990c8..d7321b5 100644
--- a/connect_transformations/static/transformations/formula.html
+++ b/connect_transformations/static/transformations/formula.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><title>Transformations/Formula</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/formula.7e06ea00eb29f0f8219a.js"></script><link href="../transformations/formula.e733cb2970fe8cd17838.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"></div><div class="button-container"><button id="add" class="button">ADD EXPRESSION</button></div></div></body></html>
\ No newline at end of file
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><title>Transformations/Formula</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/formula.9c406fdcdf9b7c4c43cc.js"></script><link href="../transformations/formula.e733cb2970fe8cd17838.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"></div><div class="button-container"><button id="add" class="button">ADD EXPRESSION</button></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/lookup_product_item.ea28feb331922b987dae.js b/connect_transformations/static/transformations/lookup_product_item.aec320dd162749d8e3a1.js
similarity index 98%
rename from connect_transformations/static/transformations/lookup_product_item.ea28feb331922b987dae.js
rename to connect_transformations/static/transformations/lookup_product_item.aec320dd162749d8e3a1.js
index 9f38bba..29689e0 100644
--- a/connect_transformations/static/transformations/lookup_product_item.ea28feb331922b987dae.js
+++ b/connect_transformations/static/transformations/lookup_product_item.aec320dd162749d8e3a1.js
@@ -81,6 +81,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/components.js
 /*
@@ -209,7 +215,7 @@ const lookupProductItem = (app) => {
     availableColumns.forEach((column) => {
       const option = document.createElement('option');
       option.value = column.id;
-      option.text = column.name;
+      option.text = getColumnLabel(column);
       document.getElementById('column').appendChild(option);
 
       const anotherOption = document.createElement('option');
diff --git a/connect_transformations/static/transformations/lookup_product_item.html b/connect_transformations/static/transformations/lookup_product_item.html
index 4d2b896..a2fa0c2 100644
--- a/connect_transformations/static/transformations/lookup_product_item.html
+++ b/connect_transformations/static/transformations/lookup_product_item.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Lookup Product Item</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/lookup_product_item.ea28feb331922b987dae.js"></script><link href="../transformations/lookup_product_item.61e184b682acdd7d3871.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container lookup" id="content"><div class="subtitle">Supported search criteria includes CloudBlue Item MPN and CloudBlue Item ID.</div><div class="input-group"><label class="label" for="criteria">Criteria</label> <select class="input" id="criteria"></select></div><div class="subtitle no-product" id="no_product">Warning: No product associated with this data stream. Please either enter a Product ID, which will be applied to all product item lookups, or select a Product column containing the row-specific product IDs.</div><div class="input-group" id="product_id_radio_group" style="margin-bottom: 8px"><p class="radio-buttons">Please specify a way to find product:</p><div class="radio-buttons"><input type="radio" id="by_product_id" name="product_id_radio" value="product_id"/> <label class="label" for="by_product_id">By static product ID</label><br/><input type="radio" id="by_product_column" name="product_id_radio" value="product_column"/> <label class="label" for="by_product_column">By column containing product IDs</label></div></div><div class="input-group" id="product_id_input"><label class="label" for="product_id">Product ID</label> <input class="input" id="product_id"/></div><div class="input-group" id="product_column_input"><label class="label" for="product_id_column">Product ID Column</label> <select class="input" id="product_id_column"></select></div><div class="input-group"><label class="label" for="column">Input Column</label> <select class="input" id="column"></select></div><div class="input-group"><label class="label" for="prefix">Prefix</label> <input class="input" id="prefix" placeholder="Prefix"/></div><div class="input-group"><p class="radio-buttons">What To Do If Product Item Not Found:</p><div class="radio-buttons"><input type="radio" id="leave_empty" name="if_not_found" value="leave_empty"/> <label class="label" for="leave_empty">Leave Empty</label> <input type="radio" id="fail" name="if_not_found" value="Fail"/> <label class="label" for="fail">Fail</label></div></div></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Lookup Product Item</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/lookup_product_item.aec320dd162749d8e3a1.js"></script><link href="../transformations/lookup_product_item.61e184b682acdd7d3871.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container lookup" id="content"><div class="subtitle">Supported search criteria includes CloudBlue Item MPN and CloudBlue Item ID.</div><div class="input-group"><label class="label" for="criteria">Criteria</label> <select class="input" id="criteria"></select></div><div class="subtitle no-product" id="no_product">Warning: No product associated with this data stream. Please either enter a Product ID, which will be applied to all product item lookups, or select a Product column containing the row-specific product IDs.</div><div class="input-group" id="product_id_radio_group" style="margin-bottom: 8px"><p class="radio-buttons">Please specify a way to find product:</p><div class="radio-buttons"><input type="radio" id="by_product_id" name="product_id_radio" value="product_id"/> <label class="label" for="by_product_id">By static product ID</label><br/><input type="radio" id="by_product_column" name="product_id_radio" value="product_column"/> <label class="label" for="by_product_column">By column containing product IDs</label></div></div><div class="input-group" id="product_id_input"><label class="label" for="product_id">Product ID</label> <input class="input" id="product_id"/></div><div class="input-group" id="product_column_input"><label class="label" for="product_id_column">Product ID Column</label> <select class="input" id="product_id_column"></select></div><div class="input-group"><label class="label" for="column">Input Column</label> <select class="input" id="column"></select></div><div class="input-group"><label class="label" for="prefix">Prefix</label> <input class="input" id="prefix" placeholder="Prefix"/></div><div class="input-group"><p class="radio-buttons">What To Do If Product Item Not Found:</p><div class="radio-buttons"><input type="radio" id="leave_empty" name="if_not_found" value="leave_empty"/> <label class="label" for="leave_empty">Leave Empty</label> <input type="radio" id="fail" name="if_not_found" value="Fail"/> <label class="label" for="fail">Fail</label></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/lookup_subscription.680e46a724ad0732665c.js b/connect_transformations/static/transformations/lookup_subscription.d97c942578580bd45e85.js
similarity index 98%
rename from connect_transformations/static/transformations/lookup_subscription.680e46a724ad0732665c.js
rename to connect_transformations/static/transformations/lookup_subscription.d97c942578580bd45e85.js
index e6ba39f..45c844d 100644
--- a/connect_transformations/static/transformations/lookup_subscription.680e46a724ad0732665c.js
+++ b/connect_transformations/static/transformations/lookup_subscription.d97c942578580bd45e85.js
@@ -81,6 +81,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/components.js
 /*
@@ -199,7 +205,7 @@ const lookupSubscription = (app) => {
     availableColumns.forEach((column) => {
       const option = document.createElement('option');
       option.value = column.id;
-      option.text = column.name;
+      option.text = getColumnLabel(column);
       document.getElementById('column').appendChild(option);
     });
 
diff --git a/connect_transformations/static/transformations/lookup_subscription.html b/connect_transformations/static/transformations/lookup_subscription.html
index 6688756..e5bc16a 100755
--- a/connect_transformations/static/transformations/lookup_subscription.html
+++ b/connect_transformations/static/transformations/lookup_subscription.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Lookup Subscription</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/lookup_subscription.680e46a724ad0732665c.js"></script><link href="../transformations/lookup_subscription.61e184b682acdd7d3871.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container lookup" id="content"><div class="subtitle">Supported search criteria includes Subscription External ID, ID and Parameter values.</div><div class="input-group"><label class="label" for="criteria">Criteria</label> <select class="input" id="criteria"></select></div><div class="input-group" id="param_name_group"><label class="label" for="parameter">Parameter Name</label> <select class="input" id="parameter"></select></div><div class="input-group"><label class="label" for="column">Input Column</label> <select class="input" id="column"></select></div><div class="input-group"><label class="label" for="prefix">Prefix</label> <input class="input" id="prefix" placeholder="Prefix"/></div><div class="input-group"><p class="radio-buttons">What To Do If Subscription Not Found:</p><div class="radio-buttons"><input type="radio" id="leave_empty" name="if_not_found" value="leave_empty"/> <label class="label" for="leave_empty">Leave Empty</label> <input type="radio" id="fail" name="if_not_found" value="Fail"/> <label class="label" for="fail">Fail</label></div></div></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Lookup Subscription</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/lookup_subscription.d97c942578580bd45e85.js"></script><link href="../transformations/lookup_subscription.61e184b682acdd7d3871.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container lookup" id="content"><div class="subtitle">Supported search criteria includes Subscription External ID, ID and Parameter values.</div><div class="input-group"><label class="label" for="criteria">Criteria</label> <select class="input" id="criteria"></select></div><div class="input-group" id="param_name_group"><label class="label" for="parameter">Parameter Name</label> <select class="input" id="parameter"></select></div><div class="input-group"><label class="label" for="column">Input Column</label> <select class="input" id="column"></select></div><div class="input-group"><label class="label" for="prefix">Prefix</label> <input class="input" id="prefix" placeholder="Prefix"/></div><div class="input-group"><p class="radio-buttons">What To Do If Subscription Not Found:</p><div class="radio-buttons"><input type="radio" id="leave_empty" name="if_not_found" value="leave_empty"/> <label class="label" for="leave_empty">Leave Empty</label> <input type="radio" id="fail" name="if_not_found" value="Fail"/> <label class="label" for="fail">Fail</label></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/split_column.9f7e57c0dbd5023c171e.js b/connect_transformations/static/transformations/split_column.377e90dbad3e37167c11.js
similarity index 98%
rename from connect_transformations/static/transformations/split_column.9f7e57c0dbd5023c171e.js
rename to connect_transformations/static/transformations/split_column.377e90dbad3e37167c11.js
index afb6b10..2701614 100644
--- a/connect_transformations/static/transformations/split_column.9f7e57c0dbd5023c171e.js
+++ b/connect_transformations/static/transformations/split_column.377e90dbad3e37167c11.js
@@ -81,6 +81,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/components.js
 /*
@@ -297,7 +303,7 @@ const splitColumn = (app) => {
     availableColumns.forEach((column) => {
       const option = document.createElement('option');
       option.value = column.id;
-      option.text = column.name;
+      option.text = getColumnLabel(column);
       document.getElementById('column').appendChild(option);
     });
 
@@ -328,7 +334,6 @@ const splitColumn = (app) => {
     hideComponent('app');
 
     const inputSelector = document.getElementById('column');
-    const selectedColumn = inputSelector.options[inputSelector.selectedIndex].text;
     const inputColumn = columns.find((column) => column.id === inputSelector.value);
     data.columns.input.push(inputColumn);
 
@@ -351,7 +356,7 @@ const splitColumn = (app) => {
     }
 
     data.settings = {
-      from: selectedColumn,
+      from: inputColumn.name,
       regex: {
         pattern: document.getElementById('pattern').value,
         groups: getCurrentGroups(document.getElementById('output')),
diff --git a/connect_transformations/static/transformations/split_column.html b/connect_transformations/static/transformations/split_column.html
index 32a633a..711ed1e 100644
--- a/connect_transformations/static/transformations/split_column.html
+++ b/connect_transformations/static/transformations/split_column.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Split Column</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/split_column.9f7e57c0dbd5023c171e.js"></script><link href="../transformations/split_column.718e9da13fe7e606d87d.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"><div id="input-column" class="input-group"><label class="label" for="column">Input Column</label> <select class="input" id="column"></select></div><div id="regex-column" class="input-group"><label class="label" for="pattern">Regular Expression</label> <input id="pattern" placeholder="Regular expression"/></div><div id="output-column" class="input-group"><label class="label" for="output">Output Columns</label><div id="output"></div><button type="button" id="refresh" class="button">Validate</button></div></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/Split Column</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/split_column.377e90dbad3e37167c11.js"></script><link href="../transformations/split_column.718e9da13fe7e606d87d.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"><div id="input-column" class="input-group"><label class="label" for="column">Input Column</label> <select class="input" id="column"></select></div><div id="regex-column" class="input-group"><label class="label" for="pattern">Regular Expression</label> <input id="pattern" placeholder="Regular expression"/></div><div id="output-column" class="input-group"><label class="label" for="output">Output Columns</label><div id="output"></div><button type="button" id="refresh" class="button">Validate</button></div></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/static/transformations/vat_rate.c50ddb25b0ef46860a4d.js b/connect_transformations/static/transformations/vat_rate.c752c401f029e90036be.js
similarity index 95%
rename from connect_transformations/static/transformations/vat_rate.c50ddb25b0ef46860a4d.js
rename to connect_transformations/static/transformations/vat_rate.c752c401f029e90036be.js
index 3026413..6f5550d 100644
--- a/connect_transformations/static/transformations/vat_rate.c50ddb25b0ef46860a4d.js
+++ b/connect_transformations/static/transformations/vat_rate.c752c401f029e90036be.js
@@ -79,6 +79,12 @@ const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/tables?ap
   },
 }).then((response) => response.json());
 
+const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};
 
 ;// CONCATENATED MODULE: ./ui/src/components.js
 /*
@@ -175,8 +181,11 @@ const vatRate = (app) => {
     const inputColumnSelect = document.getElementById('input-column');
     const outputColumnInput = document.getElementById('output-column');
     columns.forEach(column => {
-      const isSelected = settings && column.name === settings.from;
-      const option = isSelected ? `<option value="${column.name}" selected>${column.name}</option>` : `<option value="${column.name}">${column.name}</option>`;
+      const isSelected = settings && column.id === settings.from;
+      const colLabel = getColumnLabel(column);
+      const option = isSelected
+        ? `<option value="${column.id}" selected>${colLabel}</option>`
+        : `<option value="${column.id}">${colLabel}</option>`;
       inputColumnSelect.innerHTML += option;
     });
 
@@ -196,7 +205,7 @@ const vatRate = (app) => {
 
   app.listen('save', async () => {
     const inputColumnValue = document.getElementById('input-column').value;
-    const inputColumn = columns.find(column => column.name === inputColumnValue);
+    const inputColumn = columns.find(column => column.id === inputColumnValue);
     const outputColumnValue = document.getElementById('output-column').value;
     const actionIfNotFound = document.getElementById('leave_empty').checked ? 'leave_empty' : 'fail';
 
@@ -207,7 +216,7 @@ const vatRate = (app) => {
     } else {
       const data = {
         settings: {
-          from: inputColumnValue,
+          from: inputColumn.name,
           to: outputColumnValue,
           action_if_not_found: actionIfNotFound,
         },
diff --git a/connect_transformations/static/transformations/vat_rate.html b/connect_transformations/static/transformations/vat_rate.html
index e615d4c..677debe 100644
--- a/connect_transformations/static/transformations/vat_rate.html
+++ b/connect_transformations/static/transformations/vat_rate.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/VAT Rate</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/vat_rate.c50ddb25b0ef46860a4d.js"></script><link href="../transformations/vat_rate.fd0453820f860fa87060.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"><div class="wrapper"><div class="input-group"><label for="input-column">Input Column</label> <select name="inputColumn" id="input-column"></select></div><div class="input-group"><label for="output-column">Output Column</label> <input name="outputColumn" id="output-column"></div></div><div class="row"><p class="radio-buttons">What To Do For Non-EU Country Codes</p><div class="radio-buttons"><input type="radio" id="leave_empty" name="if_not_found" value="leave_empty"/> <label class="label" for="leave_empty">Leave Empty</label> <input type="radio" id="fail" name="if_not_found" value="Fail"/> <label class="label" for="fail">Fail</label></div></div></div></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="utf-8"/><title>Transformations/VAT Rate</title><script defer="defer" src="../vendors.b7829ba6a3fa12b6e5cb.js"></script><script defer="defer" src="../transformations/vat_rate.c752c401f029e90036be.js"></script><link href="../transformations/vat_rate.fd0453820f860fa87060.css" rel="stylesheet"></head><body><div id="loader"></div><div id="app"><div class="main-container" id="content"><div class="wrapper"><div class="input-group"><label for="input-column">Input Column</label> <select name="inputColumn" id="input-column"></select></div><div class="input-group"><label for="output-column">Output Column</label> <input name="outputColumn" id="output-column"></div></div><div class="row"><p class="radio-buttons">What To Do For Non-EU Country Codes</p><div class="radio-buttons"><input type="radio" id="leave_empty" name="if_not_found" value="leave_empty"/> <label class="label" for="leave_empty">Leave Empty</label> <input type="radio" id="fail" name="if_not_found" value="Fail"/> <label class="label" for="fail">Fail</label></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/connect_transformations/vat_rate/utils.py b/connect_transformations/vat_rate/utils.py
index bfff60c..556516f 100644
--- a/connect_transformations/vat_rate/utils.py
+++ b/connect_transformations/vat_rate/utils.py
@@ -16,8 +16,6 @@ def validate_vat_rate(data):
     if has_invalid_basic_structure(data):
         return build_error_response('Invalid input data')
 
-    input_columns = data['columns']['input']
-    available_input_columns = [c['name'] for c in input_columns]
     if does_not_contain_required_keys(
         data['settings'],
         ['from', 'to', 'action_if_not_found'],
@@ -27,7 +25,7 @@ def validate_vat_rate(data):
             'fields',
         )
 
-    if data['settings']['from'] not in available_input_columns:
+    if all(c['name'] != data['settings']['from'] for c in data['columns']['input']):
         return build_error_response(
             'The settings contains an invalid `from` column name'
             f' "{data["settings"]["from"]}" that does not exist on '
diff --git a/tests/webapp/test_formula.py b/tests/webapp/test_formula.py
index 2285feb..6cabab6 100644
--- a/tests/webapp/test_formula.py
+++ b/tests/webapp/test_formula.py
@@ -59,6 +59,40 @@ def test_validate_formula(
     }
 
 
+def test_validate_formula_the_same_name(
+    test_client_factory,
+):
+    data = {
+        'settings': {
+            'expressions': [
+                {
+                    'to': 'Price',
+                    'formula': '."Price (C001)" + .Tax',
+                    'ignore_errors': False,
+                    'type': 'integer',
+                },
+            ],
+        },
+        'columns': {
+            'input': [
+                {'id': 'COL-111-001', 'name': 'Price', 'nullable': False},
+                {'id': 'COL-111-002', 'name': 'Tax', 'nullable': False},
+            ],
+            'output': [],
+        },
+    }
+    client = test_client_factory(TransformationsWebApplication)
+    response = client.post('/api/formula/validate', json=data)
+
+    assert response.status_code == 200, response.content
+    data = response.json()
+    assert data == {
+        'overview': (
+            'Price = ."Price (C001)" + .Tax\n'
+        ),
+    }
+
+
 def test_validate_formula_invalid_input(
     test_client_factory,
 ):
@@ -156,38 +190,6 @@ def test_validate_formula_invalid_expression(
     }
 
 
-def test_validate_formula_unique_error(
-    test_client_factory,
-):
-    data = {
-        'settings': {
-            'expressions': [
-                {
-                    'to': 'Price',
-                    'formula': '.(Price) + .(Tax)',
-                    'ignore_errors': False,
-                    'type': 'integer',
-                },
-            ],
-        },
-        'columns': {
-            'input': [
-                {'id': 'COL-1', 'name': 'Price', 'nullable': False},
-                {'id': 'COL-2', 'name': 'Tax', 'nullable': False},
-            ],
-            'output': [],
-        },
-    }
-    client = test_client_factory(TransformationsWebApplication)
-    response = client.post('/api/formula/validate', json=data)
-
-    assert response.status_code == 400
-    data = response.json()
-    assert data == {
-        'error': 'Column `Price` already exists.',
-    }
-
-
 def test_validate_formula_duplicated_input_error(
     test_client_factory,
 ):
@@ -295,7 +297,7 @@ def test_validate_formula_non_existing_column_parenthesis(
     assert data == {
         'error': (
             'Settings contains formula `.Price + .Tax` '
-            'with column that does not exist on columns.input.'
+            'with column `Price` that does not exist on columns.input.'
         ),
     }
 
@@ -331,7 +333,7 @@ def test_validate_formula_non_existing_column(
     assert data == {
         'error': (
             'Settings contains formula `.Price + .(Tax)` '
-            'with column that does not exist on columns.input.'
+            'with column `Price` that does not exist on columns.input.'
         ),
     }
 
@@ -367,7 +369,7 @@ def test_validate_formula_non_existing_column_double_quote(
     assert data == {
         'error': (
             'Settings contains formula `."Price without Tax" + ."Tax federal"` '
-            'with column that does not exist on columns.input.'
+            'with column `Tax federal` that does not exist on columns.input.'
         ),
     }
 
@@ -410,17 +412,23 @@ def test_extract_formula_input(
         'expressions': [
             {
                 'to': 'Price with Tax',
-                'formula': '.["Price without Tax"] + .Tax + ."Additional fee"',
+                'formula': '.["Price without Tax"] + .Tax + ."Fee"',
+                'type': 'decimal',
+                'precision': '2',
+            },
+            {
+                'to': 'MSRP',
+                'formula': '.["Price without Tax (C001)"] * 1.05 + ."Tax (C002)" + ."Fee"',
                 'type': 'decimal',
                 'precision': '2',
             },
         ],
         'columns': [
-            {'name': 'Price without Tax', 'nullable': False},
-            {'name': 'Tax', 'nullable': False},
-            {'name': 'Additional fee', 'nullable': False},
-            {'name': 'Created', 'nullable': False},
-            {'name': 'Purchase', 'nullable': False},
+            {'id': 'C-1-001', 'name': 'Price without Tax', 'nullable': False},
+            {'id': 'C-1-002', 'name': 'Tax', 'nullable': False},
+            {'id': 'C-1-003', 'name': 'Fee', 'nullable': False},
+            {'id': 'C-1-004', 'name': 'Created', 'nullable': False},
+            {'id': 'C-1-005', 'name': 'Purchase', 'nullable': False},
         ],
     }
     client = test_client_factory(TransformationsWebApplication)
@@ -429,9 +437,61 @@ def test_extract_formula_input(
     assert response.status_code == 200
     data = response.json()
     assert len(data) == 3
-    assert StreamsColumn(**{'name': 'Price without Tax', 'nullable': False}).dict() in data
-    assert StreamsColumn(**{'name': 'Tax', 'nullable': False}).dict() in data
-    assert StreamsColumn(**{'name': 'Additional fee', 'nullable': False}).dict() in data
+    assert StreamsColumn(**{'id': 'C-1-001', 'name': 'Price without Tax', 'nullable': False}).dict()
+    assert StreamsColumn(**{'id': 'C-1-002', 'name': 'Tax', 'nullable': False}).dict() in data
+    assert StreamsColumn(**{'id': 'C-1-003', 'name': 'Fee', 'nullable': False}).dict() in data
+
+
+def test_extract_formula_input_dup_name_wo_suffix(
+    test_client_factory,
+):
+    data = {
+        'expressions': [
+            {
+                'to': 'Price with Tax',
+                'formula': '.["Price"]',
+                'type': 'decimal',
+                'precision': '2',
+            },
+        ],
+        'columns': [
+            {'id': 'COL-111-001', 'name': 'Price', 'nullable': False},
+            {'id': 'COL-111-002', 'name': 'Price', 'nullable': False},
+        ],
+    }
+    client = test_client_factory(TransformationsWebApplication)
+    response = client.post('/api/formula/extract_input', json=data)
+
+    assert response.status_code == 200
+    data = response.json()
+    assert len(data) == 1
+    assert StreamsColumn(**{'id': 'COL-111-002', 'name': 'Price', 'nullable': False}).dict() in data
+
+
+def test_extract_formula_input_dup_name_w_suffix(
+    test_client_factory,
+):
+    data = {
+        'expressions': [
+            {
+                'to': 'Price with Tax',
+                'formula': '."Price (C001)"',
+                'type': 'decimal',
+                'precision': '2',
+            },
+        ],
+        'columns': [
+            {'id': 'COL-111-001', 'name': 'Price', 'nullable': False},
+            {'id': 'COL-111-002', 'name': 'Price', 'nullable': False},
+        ],
+    }
+    client = test_client_factory(TransformationsWebApplication)
+    response = client.post('/api/formula/extract_input', json=data)
+
+    assert response.status_code == 200
+    data = response.json()
+    assert len(data) == 1
+    assert StreamsColumn(**{'id': 'COL-111-001', 'name': 'Price', 'nullable': False}).dict() in data
 
 
 def test_extract_formula_input_invalid_expressions(
diff --git a/ui/src/pages/transformations/airtable_lookup.js b/ui/src/pages/transformations/airtable_lookup.js
index 4f029c8..dcd4f73 100644
--- a/ui/src/pages/transformations/airtable_lookup.js
+++ b/ui/src/pages/transformations/airtable_lookup.js
@@ -16,6 +16,7 @@ import {
 import {
   getAirtableBases,
   getAirtableTables,
+  getColumnLabel,
   validate,
 } from '../../utils';
 
@@ -34,7 +35,7 @@ const createCopyRow = (parent, index, options, input, output) => {
       <select class="list" style="width: 35%;" ${input ? `value="${input.id}"` : ''}>
         ${options.map((column) => `
           <option value="${column.id}" ${input && input.id === column.id ? 'selected' : ''}>
-            ${column.name}
+            ${getColumnLabel(column)}
           </option>`).join(' ')}
       </select>
       <input type="text" placeholder="Copy column name" style="width: 35%;" ${output ? `value="${output.name}"` : ''} />
@@ -290,4 +291,3 @@ const airtable = (app) => {
 
 createApp({ })
   .then(airtable);
-
diff --git a/ui/src/pages/transformations/attachment_lookup.js b/ui/src/pages/transformations/attachment_lookup.js
index e53eada..293ff7c 100644
--- a/ui/src/pages/transformations/attachment_lookup.js
+++ b/ui/src/pages/transformations/attachment_lookup.js
@@ -18,6 +18,7 @@ import {
 
 import {
   getAttachments,
+  getColumnLabel,
   validate,
 } from '../../utils';
 
@@ -40,7 +41,7 @@ export const fillSelect = (options, id, value) => {
   options.forEach((item) => {
     const option = document.createElement('option');
     option.value = item.id;
-    option.text = item.name;
+    option.text = getColumnLabel(item);
     if (item.id === value) {
       option.selected = true;
     }
diff --git a/ui/src/pages/transformations/copy.js b/ui/src/pages/transformations/copy.js
index cb0f99d..c91893b 100644
--- a/ui/src/pages/transformations/copy.js
+++ b/ui/src/pages/transformations/copy.js
@@ -12,6 +12,7 @@ import {
   showError,
 } from '../../components';
 import {
+  getColumnLabel,
   validate,
 } from '../../utils';
 
@@ -25,7 +26,7 @@ export const createCopyRow = (parent, index, options, input, output) => {
       <select class="list" style="width: 35%;" ${input ? `value="${input.id}"` : ''}>
         ${options.map((column) => `
           <option value="${column.id}" ${input && input.id === column.id ? 'selected' : ''}>
-            ${column.name}
+            ${getColumnLabel(column)}
           </option>`).join(' ')}
       </select>
       <input type="text" placeholder="Copy column name" style="width: 35%;" ${output ? `value="${output.name}"` : ''} />
diff --git a/ui/src/pages/transformations/currency_conversion.js b/ui/src/pages/transformations/currency_conversion.js
index cbbc2d9..f890bce 100644
--- a/ui/src/pages/transformations/currency_conversion.js
+++ b/ui/src/pages/transformations/currency_conversion.js
@@ -7,6 +7,7 @@ import '@fontsource/roboto/500.css';
 import '../../../styles/index.css';
 import '../../../styles/app.styl';
 import {
+  getColumnLabel,
   getCurrencies,
   validate,
 } from '../../utils';
@@ -56,8 +57,8 @@ const convert = (app) => {
 
     columns.forEach(column => {
       const isSelected = settings && column.name === settings.from.column;
-
-      const option = isSelected ? `<option value="${column.id}" selected>${column.name}</option>` : `<option value="${column.id}">${column.name}</option>`;
+      const colLabel = getColumnLabel(column);
+      const option = isSelected ? `<option value="${column.id}" selected>${colLabel}</option>` : `<option value="${column.id}">${colLabel}</option>`;
 
       inputColumnSelect.innerHTML += option;
     });
diff --git a/ui/src/pages/transformations/filter_row.js b/ui/src/pages/transformations/filter_row.js
index b1b82b3..d4ea87f 100644
--- a/ui/src/pages/transformations/filter_row.js
+++ b/ui/src/pages/transformations/filter_row.js
@@ -13,6 +13,7 @@ import {
   showError,
 } from '../../components';
 import {
+  getColumnLabel,
   validate,
 } from '../../utils';
 
@@ -58,7 +59,7 @@ export const filterRow = (app) => {
     availableColumns.forEach((column) => {
       const option = document.createElement('option');
       option.value = column.id;
-      option.text = column.name;
+      option.text = getColumnLabel(column);
       document.getElementById('column').appendChild(option);
     });
 
@@ -106,13 +107,12 @@ export const filterRow = (app) => {
     hideComponent('app');
 
     const inputSelector = document.getElementById('column');
-    const selectedColumn = inputSelector.options[inputSelector.selectedIndex].text;
     const inputColumn = columns.find((column) => column.id === inputSelector.value);
     const matchCondition = document.getElementById('match').checked;
     data.columns.input.push(inputColumn);
     data.columns.output.push(
       {
-        name: `${selectedColumn}_INSTRUCTIONS`,
+        name: `${inputColumn.name}_INSTRUCTIONS`,
         type: 'string',
         output: false,
       },
@@ -120,7 +120,7 @@ export const filterRow = (app) => {
 
     const inputValue = document.getElementById('value');
     data.settings = {
-      from: selectedColumn,
+      from: inputColumn.name,
       value: inputValue.value,
       match_condition: matchCondition,
       additional_values: [],
diff --git a/ui/src/pages/transformations/formula.js b/ui/src/pages/transformations/formula.js
index 85122fc..d7c9831 100644
--- a/ui/src/pages/transformations/formula.js
+++ b/ui/src/pages/transformations/formula.js
@@ -9,6 +9,7 @@ import '../../../styles/index.css';
 import '../../../styles/app.styl';
 import '../../../styles/formula.css';
 import {
+  getColumnLabel,
   getJQInput,
   validate,
 } from '../../utils';
@@ -136,11 +137,11 @@ export const formula = (app) => {
     /* eslint-disable-next-line */
     const pattern = /[ .,|*:;{}[\]+\/%]/;
     suggestor = { '.': availableColumns.map(col => {
-      const needsQuotes = pattern.test(col.name);
+      const colLabel = getColumnLabel(col);
 
       return {
-        title: col.name,
-        value: needsQuotes ? `."${col.name}"` : `.${col.name}`,
+        title: colLabel,
+        value: `."${colLabel}"`,
       };
     }) };
 
diff --git a/ui/src/pages/transformations/lookup_product_item.js b/ui/src/pages/transformations/lookup_product_item.js
index 596f2a2..5141bfc 100644
--- a/ui/src/pages/transformations/lookup_product_item.js
+++ b/ui/src/pages/transformations/lookup_product_item.js
@@ -8,6 +8,7 @@ import '../../../styles/index.css';
 import '../../../styles/lookup.css';
 import '../../../styles/app.styl';
 import {
+  getColumnLabel,
   validate,
 } from '../../utils';
 import {
@@ -68,7 +69,7 @@ export const lookupProductItem = (app) => {
     availableColumns.forEach((column) => {
       const option = document.createElement('option');
       option.value = column.id;
-      option.text = column.name;
+      option.text = getColumnLabel(column);
       document.getElementById('column').appendChild(option);
 
       const anotherOption = document.createElement('option');
diff --git a/ui/src/pages/transformations/lookup_subscription.js b/ui/src/pages/transformations/lookup_subscription.js
index 754fcb4..0299a42 100644
--- a/ui/src/pages/transformations/lookup_subscription.js
+++ b/ui/src/pages/transformations/lookup_subscription.js
@@ -8,6 +8,7 @@ import '../../../styles/index.css';
 import '../../../styles/lookup.css';
 import '../../../styles/app.styl';
 import {
+  getColumnLabel,
   getLookupSubscriptionParameters,
   validate,
 } from '../../utils';
@@ -59,7 +60,7 @@ export const lookupSubscription = (app) => {
     availableColumns.forEach((column) => {
       const option = document.createElement('option');
       option.value = column.id;
-      option.text = column.name;
+      option.text = getColumnLabel(column);
       document.getElementById('column').appendChild(option);
     });
 
diff --git a/ui/src/pages/transformations/split_column.js b/ui/src/pages/transformations/split_column.js
index 9e058a3..f9ebd62 100644
--- a/ui/src/pages/transformations/split_column.js
+++ b/ui/src/pages/transformations/split_column.js
@@ -8,6 +8,7 @@ import '../../../styles/index.css';
 import '../../../styles/split_column.css';
 import '../../../styles/app.styl';
 import {
+  getColumnLabel,
   getGroups,
   validate,
 } from '../../utils';
@@ -157,7 +158,7 @@ export const splitColumn = (app) => {
     availableColumns.forEach((column) => {
       const option = document.createElement('option');
       option.value = column.id;
-      option.text = column.name;
+      option.text = getColumnLabel(column);
       document.getElementById('column').appendChild(option);
     });
 
@@ -188,7 +189,6 @@ export const splitColumn = (app) => {
     hideComponent('app');
 
     const inputSelector = document.getElementById('column');
-    const selectedColumn = inputSelector.options[inputSelector.selectedIndex].text;
     const inputColumn = columns.find((column) => column.id === inputSelector.value);
     data.columns.input.push(inputColumn);
 
@@ -211,7 +211,7 @@ export const splitColumn = (app) => {
     }
 
     data.settings = {
-      from: selectedColumn,
+      from: inputColumn.name,
       regex: {
         pattern: document.getElementById('pattern').value,
         groups: getCurrentGroups(document.getElementById('output')),
diff --git a/ui/src/pages/transformations/vat_rate.js b/ui/src/pages/transformations/vat_rate.js
index 21ed6c0..7d34184 100644
--- a/ui/src/pages/transformations/vat_rate.js
+++ b/ui/src/pages/transformations/vat_rate.js
@@ -8,6 +8,7 @@ import '../../../styles/index.css';
 import '../../../styles/app.styl';
 import '../../../styles/vat_rate.css';
 import {
+  getColumnLabel,
   validate,
 } from '../../utils';
 
@@ -36,8 +37,11 @@ const vatRate = (app) => {
     const inputColumnSelect = document.getElementById('input-column');
     const outputColumnInput = document.getElementById('output-column');
     columns.forEach(column => {
-      const isSelected = settings && column.name === settings.from;
-      const option = isSelected ? `<option value="${column.name}" selected>${column.name}</option>` : `<option value="${column.name}">${column.name}</option>`;
+      const isSelected = settings && column.id === settings.from;
+      const colLabel = getColumnLabel(column);
+      const option = isSelected
+        ? `<option value="${column.id}" selected>${colLabel}</option>`
+        : `<option value="${column.id}">${colLabel}</option>`;
       inputColumnSelect.innerHTML += option;
     });
 
@@ -57,7 +61,7 @@ const vatRate = (app) => {
 
   app.listen('save', async () => {
     const inputColumnValue = document.getElementById('input-column').value;
-    const inputColumn = columns.find(column => column.name === inputColumnValue);
+    const inputColumn = columns.find(column => column.id === inputColumnValue);
     const outputColumnValue = document.getElementById('output-column').value;
     const actionIfNotFound = document.getElementById('leave_empty').checked ? 'leave_empty' : 'fail';
 
@@ -68,7 +72,7 @@ const vatRate = (app) => {
     } else {
       const data = {
         settings: {
-          from: inputColumnValue,
+          from: inputColumn.name,
           to: outputColumnValue,
           action_if_not_found: actionIfNotFound,
         },
diff --git a/ui/src/utils.js b/ui/src/utils.js
index c2df53b..6c1c6e6 100644
--- a/ui/src/utils.js
+++ b/ui/src/utils.js
@@ -68,3 +68,9 @@ export const getAirtableTables = (key, baseId) => fetch(`/api/airtable_lookup/ta
   },
 }).then((response) => response.json());
 
+export const getColumnLabel = (column) => {
+  const colIdParts = column.id.split('-');
+  const colIdSuffix = colIdParts[colIdParts.length - 1];
+
+  return `${column.name} (C${colIdSuffix})`;
+};