diff --git a/src/components/ADempiere/Field/contextMenuField/calculator/buttons.js b/src/components/ADempiere/Field/FieldOptions/calculator/buttons.js
similarity index 100%
rename from src/components/ADempiere/Field/contextMenuField/calculator/buttons.js
rename to src/components/ADempiere/Field/FieldOptions/calculator/buttons.js
diff --git a/src/components/ADempiere/Field/contextMenuField/calculator/index.vue b/src/components/ADempiere/Field/FieldOptions/calculator/index.vue
similarity index 100%
rename from src/components/ADempiere/Field/contextMenuField/calculator/index.vue
rename to src/components/ADempiere/Field/FieldOptions/calculator/index.vue
diff --git a/src/components/ADempiere/Field/contextMenuField/changeLogs/index.vue b/src/components/ADempiere/Field/FieldOptions/changeLogs/index.vue
similarity index 100%
rename from src/components/ADempiere/Field/contextMenuField/changeLogs/index.vue
rename to src/components/ADempiere/Field/FieldOptions/changeLogs/index.vue
diff --git a/src/components/ADempiere/Field/contextMenuField/contextInfo/index.vue b/src/components/ADempiere/Field/FieldOptions/contextInfo/index.vue
similarity index 100%
rename from src/components/ADempiere/Field/contextMenuField/contextInfo/index.vue
rename to src/components/ADempiere/Field/FieldOptions/contextInfo/index.vue
diff --git a/src/components/ADempiere/Field/FieldOptions/fieldOptionsList.js b/src/components/ADempiere/Field/FieldOptions/fieldOptionsList.js
index 2eee26ad..4c6b91f7 100644
--- a/src/components/ADempiere/Field/FieldOptions/fieldOptionsList.js
+++ b/src/components/ADempiere/Field/FieldOptions/fieldOptionsList.js
@@ -21,7 +21,7 @@ export const infoOptionItem = {
   enabled: true,
   svg: false,
   icon: 'el-icon-info',
-  componentRender: () => import('@/components/ADempiere/Field/contextMenuField/contextInfo')
+  componentRender: () => import('@/components/ADempiere/Field/FieldOptions/contextInfo')
 }
 
 /**
@@ -43,7 +43,7 @@ export const zoomInOptionItem = {
   enabled: true,
   svg: false,
   icon: 'el-icon-files',
-  componentRender: () => import('@/components/ADempiere/Field/contextMenuField/contextInfo')
+  componentRender: () => import('@/components/ADempiere/Field/FieldOptions/contextInfo')
 }
 
 /**
@@ -54,7 +54,7 @@ export const translateOptionItem = {
   enabled: true,
   svg: true,
   icon: 'language',
-  componentRender: () => import('@/components/ADempiere/Field/contextMenuField/translated')
+  componentRender: () => import('@/components/ADempiere/Field/FieldOptions/translated')
 }
 
 /**
@@ -65,7 +65,7 @@ export const calculatorOptionItem = {
   enabled: true,
   svg: false,
   icon: 'el-icon-s-operation',
-  componentRender: () => import('@/components/ADempiere/Field/contextMenuField/calculator')
+  componentRender: () => import('@/components/ADempiere/Field/FieldOptions/calculator')
 }
 
 export const preferenceOptionItem = {
@@ -81,7 +81,7 @@ export const logsOptionItem = {
   enabled: true,
   svg: true,
   icon: 'tree-table',
-  componentRender: () => import('@/components/ADempiere/Field/contextMenuField/changeLogs')
+  componentRender: () => import('@/components/ADempiere/Field/FieldOptions/changeLogs')
 }
 
 /**
diff --git a/src/components/ADempiere/Field/contextMenuField/translated/index.vue b/src/components/ADempiere/Field/FieldOptions/translated/index.vue
similarity index 100%
rename from src/components/ADempiere/Field/contextMenuField/translated/index.vue
rename to src/components/ADempiere/Field/FieldOptions/translated/index.vue
diff --git a/src/views/ADempiere/Window/index.vue b/src/views/ADempiere/Window/index.vue
index 3b09878d..bc86e685 100644
--- a/src/views/ADempiere/Window/index.vue
+++ b/src/views/ADempiere/Window/index.vue
@@ -327,23 +327,21 @@
         v-if="panelContextMenu && isMobile"
       >
         <chat-entries
-          v-if="contextMenuField.name === $t('data.addNote')"
+          v-if="currentFieldOption.name === $t('data.addNote')"
           :table-name="getTableName"
           :record-id="recordId"
           :right-panel="true"
         />
         <record-access
-          v-else-if="showRecordAccess && contextMenuField.name !== $t('data.addNote')"
+          v-else-if="showRecordAccess && currentFieldOption.name !== $t('data.addNote')"
           :table-name="getTableName"
           :record="getRecord"
         />
         <component
           :is="componentRender"
-          v-else-if="!showRecordAccess && contextMenuField.name !== $t('data.addNote')"
-          :field-attributes="contextMenuField.fieldAttributes"
-          :source-field="contextMenuField.fieldAttributes"
-          :record-uuid="contextMenuField.fieldAttributes.recordUuid"
-          :field-value="contextMenuField.valueField"
+          v-else-if="!showRecordAccess && currentFieldOption.name !== $t('data.addNote')"
+          :field-attributes="currentFieldOption.fieldAttributes"
+          :field-value="currentFieldOption.valueField"
         />
       </right-panel>
     </el-container>
diff --git a/src/views/ADempiere/Window/windowLogicComponent.js b/src/views/ADempiere/Window/windowLogicComponent.js
index f6c0c3aa..146d1d15 100644
--- a/src/views/ADempiere/Window/windowLogicComponent.js
+++ b/src/views/ADempiere/Window/windowLogicComponent.js
@@ -91,7 +91,7 @@ export default {
     }
   },
   computed: {
-    contextMenuField() {
+    currentFieldOption() {
       return this.$store.getters.getFieldContextMenu
     },
     panelContextMenu() {
@@ -99,21 +99,21 @@ export default {
     },
     componentRender() {
       let component
-      switch (this.contextMenuField.name) {
+      switch (this.currentFieldOption.name) {
         case this.$t('field.info'):
-          component = () => import('@/components/ADempiere/Field/contextMenuField/contextInfo')
+          component = () => import('@/components/ADempiere/Field/FieldOptions/contextInfo')
           break
         case this.$t('language'):
-          component = () => import('@/components/ADempiere/Field/contextMenuField/translated')
+          component = () => import('@/components/ADempiere/Field/FieldOptions/translated')
           break
         case this.$t('field.calculator'):
-          component = () => import('@/components/ADempiere/Field/contextMenuField/calculator')
+          component = () => import('@/components/ADempiere/Field/FieldOptions/calculator')
           break
         case this.$t('field.preference'):
           component = () => import('@/components/ADempiere/Field/FieldOptions/preference')
           break
         case this.$t('field.logsField'):
-          component = () => import('@/components/ADempiere/Field/contextMenuField/changeLogs')
+          component = () => import('@/components/ADempiere/Field/FieldOptions/changeLogs')
           break
         case this.$t('operators.operator'):
           component = () => import('@/components/ADempiere/Field/FieldOptions/operatorComparison')