diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
index db83fbe56a..8ba53d646b 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
@@ -1189,7 +1189,7 @@ void RiuSummaryCurveDefSelection::defineEditorAttribute( const caf::PdmFieldHand
     {
         if ( &m_selectedSummaryCategories == field )
         {
-            attrib->fieldToReceiveCurrentItemValue   = &m_currentSummaryCategory;
+            attrib->currentIndexFieldHandle          = &m_currentSummaryCategory;
             attrib->showTextFilter                   = false;
             attrib->showToggleAllCheckbox            = false;
             attrib->setCurrentIndexWhenItemIsChecked = true;
diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
index 6ffdf32fc5..e41504a3c2 100644
--- a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
@@ -786,7 +786,7 @@ protected:
             caf::PdmUiTreeSelectionEditorAttribute* attr = dynamic_cast<caf::PdmUiTreeSelectionEditorAttribute*>(attribute);
             if (attr)
             {
-                attr->fieldToReceiveCurrentItemValue = &m_highlightedEnum;
+                attr->currentIndexFieldHandle = &m_highlightedEnum;
             }
         }
         else if (field == &m_proxyEnumField)
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
index cabc12f4f4..df3cdcba00 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
@@ -355,9 +355,9 @@ void PdmUiTreeSelectionEditor::configureAndUpdateUi(const QString& uiConfigName)
 
     m_model->resetUiValueCache();
 
-    if (m_attributes.fieldToReceiveCurrentItemValue)
+    if (m_attributes.currentIndexFieldHandle)
     {
-        PdmUiFieldHandle* uiFieldHandle = m_attributes.fieldToReceiveCurrentItemValue->uiCapability();
+        PdmUiFieldHandle* uiFieldHandle = m_attributes.currentIndexFieldHandle->uiCapability();
         if (uiFieldHandle)
         {
             QModelIndexList indices = allVisibleSourceModelIndices();
@@ -657,9 +657,9 @@ void PdmUiTreeSelectionEditor::currentChanged(const QModelIndex& current)
         m_proxyModel->setData(current, true, Qt::CheckStateRole);
     }
 
-    if (m_attributes.fieldToReceiveCurrentItemValue)
+    if (m_attributes.currentIndexFieldHandle)
     {
-        PdmUiFieldHandle* uiFieldHandle = m_attributes.fieldToReceiveCurrentItemValue->uiCapability();
+        PdmUiFieldHandle* uiFieldHandle = m_attributes.currentIndexFieldHandle->uiCapability();
         if (uiFieldHandle)
         {
             QVariant v = m_proxyModel->data(current, PdmUiTreeSelectionQModel::optionItemValueRole());
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.h
index 97a5a883a2..542f5d4418 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.h
@@ -64,11 +64,11 @@ public:
     bool singleSelectionMode;
     bool setCurrentIndexWhenItemIsChecked;
 
-    /// fieldToReceiveCurrentFieldValue is used to communicate the value of current item in the tree view
+    /// currentIndexFieldHandle is used to communicate the value of current item in the tree view
     /// This is useful when displaying a list of appEnums, and a dependent view is displaying content based on 
     /// the current item in the tree view
     /// Make sure the type of the receiving field is of the same type as the field used in PdmUiTreeSelectionEditor
-    caf::PdmFieldHandle* fieldToReceiveCurrentItemValue;
+    caf::PdmFieldHandle* currentIndexFieldHandle;
 
 public:
     PdmUiTreeSelectionEditorAttribute()
@@ -78,7 +78,7 @@ public:
         singleSelectionMode = false;
         setCurrentIndexWhenItemIsChecked = false;
 
-        fieldToReceiveCurrentItemValue = nullptr;
+        currentIndexFieldHandle = nullptr;
     }
 };