diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h
index 45576f62e6..c724f6c255 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h
@@ -53,26 +53,26 @@ public: // Virtual
     virtual PdmFieldHandle* objectToggleField() { return NULL; }
 
     /// Method to reimplement to catch when the field has changed due to setUiValue()
-    virtual void            fieldChangedByUi(const PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) {}
+    virtual void            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) {}
     /// Method to re-implement to supply option values for a specific field
     virtual QList<PdmOptionItemInfo>
-        calculateValueOptions(const PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { return QList<PdmOptionItemInfo>(); }
+        calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { return QList<PdmOptionItemInfo>(); }
 
 protected:
     /// Override to customize the order and grouping of the Gui.
     /// Fill up the uiOrdering object with groups and field references to create the gui structure
     /// If the uiOrdering is empty, it is interpreted as meaning all fields w/o grouping.
-    virtual void            defineUiOrdering(QString uiConfigName, PdmUiOrdering& uiOrdering)  {}
+    virtual void            defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)  {}
 
     /// Override to customize the tree representations of the object hierarchy.
     /// If the PdmUiTreeOrdering is empty, it is interpreted as meaning all fields containing child objects in order
-    virtual void            defineUiTreeOrdering(PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") { }
+    virtual void            defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") { }
 
     /// Override to provide editor specific data for the field and uiConfigName 
-    virtual void            defineEditorAttribute(const PdmFieldHandle* field, QString uiConfigName, PdmUiEditorAttribute* attribute) {}
+    virtual void            defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) {}
 
     /// Override to provide editor specific data for the uiConfigName for the object
-    virtual void            defineObjectEditorAttribute(QString uiConfigName, PdmUiEditorAttribute* attribute) {}
+    virtual void            defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) {}
 
     /// This method is intended to be used in macros to make compile time errors 
     // if user uses them on wrong type of objects