diff --git a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
index e09bc9df37..d30a1e3624 100644
--- a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
@@ -31,7 +31,7 @@
 
 
 namespace caf
-{
+{ // Obsolete stuff
     template<>
     void caf::AppEnum< RimCellPropertyFilter::EvaluationRegionType>::setUp()
     {
@@ -52,9 +52,9 @@ RimCellPropertyFilter::RimCellPropertyFilter()
 {
     CAF_PDM_InitObject("Cell Property Filter", ":/CellFilter_Values.png", "", "");
 
-    CAF_PDM_InitFieldNoDefault(&evaluationRegion, "EvaluationRegion", "Evaluation region", "", "", "");
-    evaluationRegion.setUiHidden(true);
-    evaluationRegion.setIOWritable(false);
+    CAF_PDM_InitFieldNoDefault(&obsoleteField_evaluationRegion, "EvaluationRegion", "Evaluation region", "", "", "");
+    obsoleteField_evaluationRegion.setUiHidden(true);
+    obsoleteField_evaluationRegion.setIOWritable(false);
 
     CAF_PDM_InitFieldNoDefault(&resultDefinition, "ResultDefinition", "Result definition", "", "", "");
     resultDefinition = new RimResultDefinition();
@@ -108,13 +108,13 @@ void RimCellPropertyFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedF
     if ( &(resultDefinition->m_resultVariableUiField) == changedField )
     {
         resultDefinition->fieldChangedByUi(changedField, oldValue, newValue);
-        setDefaultValues();
+        setToDefaultValues();
         m_parentContainer->fieldChangedByUi(changedField, oldValue,  newValue);
     }
 
     if (   &lowerBound == changedField 
         || &upperBound == changedField
-        || &evaluationRegion == changedField
+        || &obsoleteField_evaluationRegion == changedField
         || &isActive == changedField
         || &filterMode == changedField)
     {
@@ -171,7 +171,7 @@ RimCellPropertyFilterCollection* RimCellPropertyFilter::parentContainer()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCellPropertyFilter::setDefaultValues()
+void RimCellPropertyFilter::setToDefaultValues()
 {
     CVF_ASSERT(m_parentContainer);
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
index b1fb0945c8..a658378001 100644
--- a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
+++ b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
@@ -37,38 +37,41 @@ class RigCaseCellResultsData;
 class RimCellPropertyFilter : public RimCellFilter
 {
     CAF_PDM_HEADER_INIT;
+ 
+public:
+    RimCellPropertyFilter();
+    virtual ~RimCellPropertyFilter();
 
+    caf::PdmField<RimResultDefinition*>     resultDefinition;
+
+    caf::PdmField<double>                   lowerBound;
+    caf::PdmField<double>                   upperBound;
+
+    void                                    setParentContainer(RimCellPropertyFilterCollection* parentContainer);
+    RimCellPropertyFilterCollection*        parentContainer();
+    void                                    setToDefaultValues();
+    void                                    computeResultValueRange();
+
+    virtual void                            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
+protected:
+    virtual QList<caf::PdmOptionItemInfo>   calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly );
+    virtual void                            defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
+    virtual void                            defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
+
+private:
+    RimCellPropertyFilterCollection*        m_parentContainer;
+    double                                  m_minimumResultValue; 
+    double                                  m_maximumResultValue;
+
+public:
+    // Obsolete stuff 
     enum EvaluationRegionType
     {
         RANGE_FILTER_REGION,
         GLOBAL_REGION
     };
-
-public:
-    RimCellPropertyFilter();
-    virtual ~RimCellPropertyFilter();
-
-    void setParentContainer(RimCellPropertyFilterCollection* parentContainer);
-    RimCellPropertyFilterCollection* parentContainer();
-    void setDefaultValues();
-    void computeResultValueRange();
-
-    caf::PdmField<RimResultDefinition*> resultDefinition;
-
-    caf::PdmField<double>   lowerBound;
-    caf::PdmField<double>   upperBound;
-    caf::PdmField< caf::AppEnum< EvaluationRegionType > > evaluationRegion;
-
-    virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
-
-    virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly );
-
-protected:
-    virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
-    virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
-
 private:
-    RimCellPropertyFilterCollection* m_parentContainer;
-    double m_minimumResultValue, m_maximumResultValue;
+    caf::PdmField< caf::AppEnum< EvaluationRegionType > > obsoleteField_evaluationRegion;
+
 };
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
index e7cb95e383..e6d8fae4a7 100644
--- a/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
@@ -98,7 +98,7 @@ RimCellPropertyFilter* RimCellPropertyFilterCollection::createAndAppendPropertyF
     propertyFilter->resultDefinition->setPorosityModel(m_reservoirView->cellResult->porosityModel());
     propertyFilter->resultDefinition->setResultType(m_reservoirView->cellResult->resultType());
     propertyFilter->resultDefinition->loadResult();
-    propertyFilter->setDefaultValues();
+    propertyFilter->setToDefaultValues();
 
     propertyFilter->name = QString("New Filter (%1)").arg(propertyFilters().size());
 
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
index c44b7e8a45..aec143d14a 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
@@ -184,7 +184,7 @@ void RimEclipseCase::removeResult(const QString& resultName)
             {
                 propertyFilter->resultDefinition->setResultVariable(RimDefines::undefinedResultName());
                 propertyFilter->resultDefinition->loadResult();
-                propertyFilter->setDefaultValues();
+                propertyFilter->setToDefaultValues();
 
                 rebuildDisplayModel = true;
             }
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
index c6b10b9250..6ad6392132 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
@@ -103,7 +103,7 @@ RimGeoMechPropertyFilterCollection* RimGeoMechPropertyFilter::parentContainer()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimGeoMechPropertyFilter::updateDefaultValues()
+void RimGeoMechPropertyFilter::setToDefaultValues()
 {
     CVF_ASSERT(m_parentContainer);
 
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.h b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.h
index 2f8f9cda87..faf533e308 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.h
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.h
@@ -33,36 +33,28 @@ class RimGeoMechPropertyFilter : public RimCellFilter
 {
     CAF_PDM_HEADER_INIT;
 
-    enum EvaluationRegionType
-    {
-        RANGE_FILTER_REGION,
-        GLOBAL_REGION
-    };
-
 public:
     RimGeoMechPropertyFilter();
     virtual ~RimGeoMechPropertyFilter();
 
-    void setParentContainer(RimGeoMechPropertyFilterCollection* parentContainer);
-    RimGeoMechPropertyFilterCollection* parentContainer();
-    void updateDefaultValues();
-    void computeResultValueRange();
+    caf::PdmField<RimGeoMechResultDefinition*>  resultDefinition;
 
-    caf::PdmField<RimGeoMechResultDefinition*> resultDefinition;
+    caf::PdmField<double>                       lowerBound;
+    caf::PdmField<double>                       upperBound;
 
-    caf::PdmField<double>   lowerBound;
-    caf::PdmField<double>   upperBound;
+    void                                        setParentContainer(RimGeoMechPropertyFilterCollection* parentContainer);
+    RimGeoMechPropertyFilterCollection*         parentContainer();
+    void                                        setToDefaultValues();
+    void                                        computeResultValueRange();
     
-    
-    virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
-
-
+    virtual void                                fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
 protected:
-    virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
-    virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
+    virtual void                                defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
+    virtual void                                defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
 
 private:
-    RimGeoMechPropertyFilterCollection* m_parentContainer;
-    double m_minimumResultValue, m_maximumResultValue;
+    RimGeoMechPropertyFilterCollection*         m_parentContainer;
+    double                                      m_minimumResultValue; 
+    double                                      m_maximumResultValue;
 };
 
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
index 6ac229c41f..730905c010 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
@@ -97,7 +97,7 @@ RimGeoMechPropertyFilter* RimGeoMechPropertyFilterCollection::createAndAppendPro
 
     propertyFilter->resultDefinition->setResultAddress(m_reservoirView->cellResult()->resultAddress());
     propertyFilter->resultDefinition->loadResult();
-    propertyFilter->updateDefaultValues();
+    propertyFilter->setToDefaultValues();
 
     propertyFilter->name = QString("New Filter (%1)").arg(propertyFilters().size());
 
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
index 87ac740804..8aad0bfe49 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
@@ -188,7 +188,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
             
             if (m_propertyFilter)
             {
-                m_propertyFilter->updateDefaultValues();
+                m_propertyFilter->setToDefaultValues();
 
                 ((RimView*)reservoirView())->scheduleGeometryRegen(PROPERTY_FILTERED);
             }