diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/register/sebDTO/OdoSpeedField.java b/src/main/java/org/mobidgim/mobidigimproject/model/register/sebDTO/OdoSpeedField.java
index b1b84fa..3647383 100644
--- a/src/main/java/org/mobidgim/mobidigimproject/model/register/sebDTO/OdoSpeedField.java
+++ b/src/main/java/org/mobidgim/mobidigimproject/model/register/sebDTO/OdoSpeedField.java
@@ -8,7 +8,7 @@ import org.mobidgim.mobidigimproject.model.register.enums.OdoSpeedSource;
 @Setter
 public class OdoSpeedField {
 
-    private OdoSpeedSource odoSpeedSource;
+    private OdoSpeedSource source;
 
     private String id;
 
diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/register/sebDTO/OdsDirField.java b/src/main/java/org/mobidgim/mobidigimproject/model/register/sebDTO/OdsDirField.java
index b0e6439..28b0d12 100644
--- a/src/main/java/org/mobidgim/mobidigimproject/model/register/sebDTO/OdsDirField.java
+++ b/src/main/java/org/mobidgim/mobidigimproject/model/register/sebDTO/OdsDirField.java
@@ -9,7 +9,7 @@ import org.mobidgim.mobidigimproject.model.register.enums.OdoSpeedSource;
 @Setter
 public class OdsDirField {
 
-    private OdoDirSource odoSpeedSource;
+    private OdoDirSource source;
 
     private String id;
 
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index 2f17783..50684ec 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -415,8 +415,8 @@
                             <th>ODT</th>
                             <th>Default Value</th>
                             <th>Shift</th>
-                            <th>Expression</th>
                             <th>Mask</th>
+                            <th>Expression</th>
                             <th>Action</th>
                         </tr>
                         </thead>
@@ -440,8 +440,8 @@
                             <th>Source</th>
                             <th>ID</th>
                             <th>Shift</th>
-                            <th>Expression</th>
                             <th>Mask</th>
+                            <th>Expression</th>
                         </tr>
                         </thead>
                         <tbody id="odometer-field-list">
diff --git a/src/main/resources/static/js/protocol/can.js b/src/main/resources/static/js/protocol/can.js
index c003013..8fee461 100644
--- a/src/main/resources/static/js/protocol/can.js
+++ b/src/main/resources/static/js/protocol/can.js
@@ -15,8 +15,8 @@ function buildRow(data = {}) {
             </td>
             <td><input class="can-dv-input" value="${data.dv ?? ''}"></td>
             <td><input class="can-shift-input" value="${data.shift ?? ''}"></td>
-            <td><input class="can-expr-input" value="${data.expr ?? ''}"></td>
             <td><input class="can-mask-input" value="${data.mask ?? ''}"></td>
+            <td><input class="can-expr-input" value="${data.expr ?? ''}"></td>
             <td><button type="button" class="inline-delete-btn">Delete</button></td>
         </tr>
     `;
diff --git a/src/main/resources/static/js/protocol/odometer.js b/src/main/resources/static/js/protocol/odometer.js
index 4686476..00d33c8 100644
--- a/src/main/resources/static/js/protocol/odometer.js
+++ b/src/main/resources/static/js/protocol/odometer.js
@@ -14,8 +14,8 @@ function buildRow(target, data = {}) {
             </td>
             <td><input class="odometer-id-input" value="${safeData.id ?? ''}"></td>
             <td><input class="odometer-shift-input" value="${safeData.shift ?? ''}"></td>
-            <td><input class="odometer-expr-input" value="${safeData.expr ?? ''}"></td>
             <td><input class="odometer-mask-input" value="${safeData.mask ?? ''}"></td>
+            <td><input class="odometer-expr-input" value="${safeData.expr ?? ''}"></td>
         </tr>
     `;
 }