diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
index 1070ca1279..35a053a93a 100644
--- a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
@@ -241,7 +241,7 @@ public:
         CAF_PDM_InitField(&m_doubleField,   "BigNumber",    0.0,        "Big Number",   "", "Enter a big number here", "This is a place you can enter a big real value if you want");
         CAF_PDM_InitField(&m_intField,      "IntNumber",    0,          "Small Number", "", "Enter some small number here",  "This is a place you can enter a small integer value if you want" );
         CAF_PDM_InitField(&m_boolField,     "BooleanValue", false,      "Boolean:" ,    "", "Boolean:Enter some small number here", "Boolean:This is a place you can enter a small integer value if you want");
-        CAF_PDM_InitField(&m_textField,     "TextField",    QString("Demo Object Description Field"), "",            "", "", "");
+        CAF_PDM_InitField(&m_textField,     "TextField",    QString("Demo Object Description Field"), "Description Field",            "", "", "");
         CAF_PDM_InitField(&m_filePath,      "FilePath",    QString(""),  "Filename",            "", "", "");
         CAF_PDM_InitField(&m_longText,      "LongText",    QString("Test text"),  "Long Text",            "", "", "");
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
index e38a6bdf61..b0146df257 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
@@ -39,6 +39,7 @@
 
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
+#include "cafPdmUiCommandSystemProxy.h"
 #include "cafPdmUiDragDropInterface.h"
 #include "cafPdmUiTreeItemEditor.h"
 #include "cafPdmUiTreeOrdering.h"
@@ -684,7 +685,7 @@ bool PdmUiTreeViewModel::setData(const QModelIndex &index, const QVariant &value
             PdmUiFieldHandle* userDescriptionUiField = uiObject->userDescriptionField()->uiCapability();
             if (userDescriptionUiField)
             {
-                userDescriptionUiField->setValueFromUi(value);
+                PdmUiCommandSystemProxy::instance()->setUiValueToField(userDescriptionUiField, value);
             }
 
             return true;
@@ -698,7 +699,7 @@ bool PdmUiTreeViewModel::setData(const QModelIndex &index, const QVariant &value
             PdmUiFieldHandle* toggleUiField = uiObject->objectToggleField()->uiCapability();
             if (toggleUiField)
             {
-                toggleUiField->setValueFromUi(value);
+                PdmUiCommandSystemProxy::instance()->setUiValueToField(toggleUiField, toggleOn);
             }
 
             return true;