diff --git a/models/types.ts b/models/types.ts
index 584f602b..b0db6d93 100644
--- a/models/types.ts
+++ b/models/types.ts
@@ -11,7 +11,7 @@ export enum ModelNameEnum {
   Defaults = 'Defaults',
   Item = 'Item',
   UOM = 'UOM',
-  UOMConversionFactor = 'UOMConversionFactor',
+  UOMConversionItem = 'UOMConversionItem',
   JournalEntry = 'JournalEntry',
   JournalEntryAccount = 'JournalEntryAccount',
   Misc = 'Misc',
diff --git a/schemas/app/InvoiceItem.json b/schemas/app/InvoiceItem.json
index 0eef629b..9833d07f 100644
--- a/schemas/app/InvoiceItem.json
+++ b/schemas/app/InvoiceItem.json
@@ -17,41 +17,45 @@
       "label": "Description",
       "fieldtype": "Text"
     },
+    {
+      "fieldname": "rate",
+      "label": "Rate",
+      "fieldtype": "Currency",
+      "required": true
+    },
+    {
+      "fieldname": "transferUnit",
+      "label": "Transfer Unit",
+      "fieldtype": "Link",
+      "target": "UOM",
+      "placeholder": "Unit"
+    },
+    {
+      "fieldname": "transferQuantity",
+      "label": "Qty. in Transfer Unit",
+      "fieldtype": "Float",
+      "required": true
+    },
+    {
+      "fieldname": "unit",
+      "label": "Stock Unit",
+      "fieldtype": "Link",
+      "target": "UOM",
+      "default": "Unit",
+      "placeholder": "Unit",
+      "readOnly": true
+    },
     {
       "fieldname": "quantity",
-      "label": "Quantity",
+      "label": "Qty. in Stock Unit",
       "fieldtype": "Float",
       "required": true,
       "default": 1
     },
     {
-      "fieldname": "transferQty",
-      "label": "Qty as per Stock UOM",
-      "fieldtype": "Float",
-      "required": true
-    },
-    {
-      "fieldname": "stockUOM",
-      "label": "Stock UOM",
-      "fieldtype": "Data",
-      "readOnly": true
-    },
-    {
-      "fieldname": "uom",
-      "label": "UOM",
-      "fieldtype": "Link",
-      "target": "UOM"
-    },
-    {
-      "fieldname": "UOMConversionFactor",
+      "fieldname": "unitConversionFactor",
       "label": "Conversion Factor",
       "fieldtype": "Float",
-      "required": "true"
-    },
-    {
-      "fieldname": "rate",
-      "label": "Rate",
-      "fieldtype": "Currency",
       "required": true
     },
     {
@@ -119,17 +123,7 @@
       "readOnly": true
     }
   ],
-  "tableFields": [
-    "item",
-    "tax",
-    "stockUOM",
-    "uom",
-    "UOMConversionFactor",
-    "transferQty",
-    "quantity",
-    "rate",
-    "amount"
-  ],
+  "tableFields": ["item", "tax", "quantity", "rate", "amount"],
   "keywordFields": ["item", "tax"],
   "quickEditFields": [
     "item",
@@ -137,12 +131,12 @@
     "description",
     "hsnCode",
     "tax",
-    "stockUOM",
-    "uom",
-    "UOMConversionFactor",
-    "transferQty",
-    "quantity",
     "rate",
+    "transferUnit",
+    "transferQuantity",
+    "unit",
+    "quantity",
+    "unitConversionFactor",
     "amount",
     "setItemDiscountAmount",
     "itemDiscountAmount",
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index f1e677ec..3c356736 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -128,8 +128,18 @@
       "fieldname": "trackItem",
       "label": "Track Item",
       "fieldtype": "Check",
+<<<<<<< HEAD
       "default": false,
       "section": "Inventory"
+=======
+      "default": false
+    },
+    {
+      "fieldname": "uomConversions",
+      "label": "UOM Conversions",
+      "fieldtype": "Table",
+      "target": "UOMConversionItem"
+>>>>>>> f5cca273 (fix: unit conversion related schema names)
     }
   ],
   "quickEditFields": [
diff --git a/schemas/app/inventory/StockMovementItem.json b/schemas/app/inventory/StockMovementItem.json
index 311d1f01..74b00c78 100644
--- a/schemas/app/inventory/StockMovementItem.json
+++ b/schemas/app/inventory/StockMovementItem.json
@@ -27,35 +27,39 @@
       "create": true
     },
     {
-      "fieldname": "transferQty",
-      "label": "Qty as per Stock UOM",
+      "fieldname": "transferUnit",
+      "label": "Transfer Unit",
+      "fieldtype": "Link",
+      "target": "UOM",
+      "placeholder": "Unit"
+    },
+    {
+      "fieldname": "transferQuantity",
+      "label": "Qty. in Transfer Unit",
       "fieldtype": "Float",
       "required": true
     },
+    {
+      "fieldname": "unit",
+      "label": "Stock Unit",
+      "fieldtype": "Link",
+      "target": "UOM",
+      "default": "Unit",
+      "placeholder": "Unit",
+      "readOnly": true
+    },
     {
       "fieldname": "quantity",
-      "label": "Quantity",
+      "label": "Qty. in Stock Unit",
       "fieldtype": "Float",
       "required": true,
       "default": 1
     },
     {
-      "fieldname": "stockUOM",
-      "label": "Stock UOM",
-      "fieldtype": "Data",
-      "readOnly": true
-    },
-    {
-      "fieldname": "uom",
-      "label": "UOM",
-      "fieldtype": "Link",
-      "target": "UOM"
-    },
-    {
-      "fieldname": "UOMConversionFactor",
+      "fieldname": "unitConversionFactor",
       "label": "Conversion Factor",
       "fieldtype": "Float",
-      "required": "true"
+      "required": true
     },
     {
       "fieldname": "rate",
@@ -70,27 +74,17 @@
       "readOnly": true
     }
   ],
-  "tableFields": [
-    "item",
-    "fromLocation",
-    "toLocation",
-    "stockUOM",
-    "uom",
-    "UOMConversionFactor",
-    "transferQty",
-    "quantity",
-    "rate"
-  ],
+  "tableFields": ["item", "fromLocation", "toLocation", "quantity", "rate"],
   "keywordFields": ["item"],
   "quickEditFields": [
     "item",
     "fromLocation",
     "toLocation",
-    "stockUOM",
-    "uom",
-    "UOMConversionFactor",
-    "transferQty",
+    "transferUnit",
+    "transferQuantity",
+    "unit",
     "quantity",
+    "unitConversionFactor",
     "rate",
     "amount"
   ]
diff --git a/schemas/app/inventory/StockTransferItem.json b/schemas/app/inventory/StockTransferItem.json
index 198db9b3..55b6460c 100644
--- a/schemas/app/inventory/StockTransferItem.json
+++ b/schemas/app/inventory/StockTransferItem.json
@@ -17,36 +17,40 @@
       "target": "Location",
       "required": true
     },
+    {
+      "fieldname": "transferUnit",
+      "label": "Transfer Unit",
+      "fieldtype": "Link",
+      "target": "UOM",
+      "placeholder": "Unit"
+    },
+    {
+      "fieldname": "transferQuantity",
+      "label": "Qty. in Transfer Unit",
+      "fieldtype": "Float",
+      "required": true
+    },
+    {
+      "fieldname": "unit",
+      "label": "Stock Unit",
+      "fieldtype": "Link",
+      "target": "UOM",
+      "default": "Unit",
+      "placeholder": "Unit",
+      "readOnly": true
+    },
     {
       "fieldname": "quantity",
-      "label": "Quantity",
+      "label": "Qty. in Stock Unit",
       "fieldtype": "Float",
       "required": true,
       "default": 1
     },
     {
-      "fieldname": "transferQty",
-      "label": "Qty as per Stock UOM",
-      "fieldtype": "Float",
-      "required": true
-    },
-    {
-      "fieldname": "stockUOM",
-      "label": "Stock UOM",
-      "fieldtype": "Data",
-      "readOnly": true
-    },
-    {
-      "fieldname": "uom",
-      "label": "UOM",
-      "fieldtype": "Link",
-      "target": "UOM"
-    },
-    {
-      "fieldname": "UOMConversionFactor",
+      "fieldname": "unitConversionFactor",
       "label": "Conversion Factor",
       "fieldtype": "Float",
-      "required": "true"
+      "required": true
     },
     {
       "fieldname": "rate",
@@ -60,14 +64,6 @@
       "fieldtype": "Currency",
       "readOnly": true
     },
-    {
-      "fieldname": "unit",
-      "label": "Unit Type",
-      "fieldtype": "Link",
-      "target": "UOM",
-      "default": "Unit",
-      "placeholder": "Unit Type"
-    },
     {
       "fieldname": "description",
       "label": "Description",
@@ -81,28 +77,17 @@
       "placeholder": "HSN/SAC Code"
     }
   ],
-  "tableFields": [
-    "item",
-    "location",
-    "stockUOM",
-    "uom",
-    "UOMConversionFactor",
-    "transferQty",
-    "quantity",
-    "rate",
-    "amount"
-  ],
+  "tableFields": ["item", "location", "quantity", "rate", "amount"],
   "quickEditFields": [
     "item",
+    "transferUnit",
+    "transferQuantity",
     "unit",
+    "quantity",
+    "unitConversionFactor",
     "description",
     "hsnCode",
     "location",
-    "stockUOM",
-    "uom",
-    "UOMConversionFactor",
-    "transferQty",
-    "quantity",
     "rate",
     "amount"
   ]
diff --git a/schemas/app/UOMConversionFactor.json b/schemas/app/inventory/UOMConversionItem.json
similarity index 59%
rename from schemas/app/UOMConversionFactor.json
rename to schemas/app/inventory/UOMConversionItem.json
index c37bd358..54f76a78 100644
--- a/schemas/app/UOMConversionFactor.json
+++ b/schemas/app/inventory/UOMConversionItem.json
@@ -1,6 +1,6 @@
 {
-  "name": "UOMConversionFactor",
-  "label": "UOM Conversion Factor",
+  "name": "UOMConversionItem",
+  "label": "UOM Conversion Item",
   "isChild": true,
   "fields": [
     {
@@ -12,13 +12,12 @@
       "required": true
     },
     {
-      "fieldname": "value",
-      "label": "Value",
+      "fieldname": "conversionFactor",
+      "label": "Conversion Factor",
       "fieldtype": "Float",
       "default": 1,
       "required": true
     }
   ],
-  "tableFields": ["uom", "value"],
-  "quickEditFields": ["uom", "value"]
+  "tableFields": ["uom", "conversionFactor"]
 }
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
index 12fa2f24..f19307fa 100644
--- a/schemas/schemas.ts
+++ b/schemas/schemas.ts
@@ -37,7 +37,7 @@ import Tax from './app/Tax.json';
 import TaxDetail from './app/TaxDetail.json';
 import TaxSummary from './app/TaxSummary.json';
 import UOM from './app/UOM.json';
-import UOMConversionFactor from './app/UOMConversionFactor.json'
+import UOMConversionItem from './app/inventory/UOMConversionItem.json';
 import PatchRun from './core/PatchRun.json';
 import SingleValue from './core/SingleValue.json';
 import SystemSettings from './core/SystemSettings.json';
@@ -82,8 +82,8 @@ export const appSchemas: Schema[] | SchemaStub[] = [
   Address as Schema,
   Item as Schema,
   UOM as Schema,
-  UOMConversionFactor as Schema,
-  
+  UOMConversionItem as Schema,
+
   Payment as Schema,
   PaymentFor as Schema,