diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
index 1a879e927c..753ced8e64 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
@@ -91,8 +91,8 @@ RimEclipseCase::RimEclipseCase()
     CAF_PDM_InitFieldNoDefault(&m_fractureModelResults, "FractureModelResults", "",  "", "", "");
     m_fractureModelResults.uiCapability()->setUiHidden(true);
 
-    CAF_PDM_InitField(&flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", "");
-    CAF_PDM_InitField(&flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", "");
+    CAF_PDM_InitField(&m_flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", "");
+    CAF_PDM_InitField(&m_flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_filesContainingFaultsSemColSeparated,    "CachedFileNamesContainingFaults", "", "", "", "");
     m_filesContainingFaultsSemColSeparated.uiCapability()->setUiHidden(true);
@@ -397,18 +397,18 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
 //--------------------------------------------------------------------------------------------------
 void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
-    if (changedField == &releaseResultMemory)
+    if (changedField == &m_releaseResultMemory)
     {
         reloadDataAndUpdate();
 
-        releaseResultMemory = oldValue.toBool();
+        m_releaseResultMemory = oldValue.toBool();
     }
-    else if (changedField == &flipXAxis || changedField == &flipYAxis)
+    else if (changedField == &m_flipXAxis || changedField == &m_flipYAxis)
     {
         RigEclipseCaseData* rigEclipseCase = eclipseCaseData();
         if (rigEclipseCase)
         {
-            rigEclipseCase->mainGrid()->setFlipAxis(flipXAxis, flipYAxis);
+            rigEclipseCase->mainGrid()->setFlipAxis(m_flipXAxis, m_flipYAxis);
 
             computeCachedData();
 
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.h b/ApplicationCode/ProjectDataModel/RimEclipseCase.h
index 2b325dcff9..e9ea2ca09e 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h
@@ -61,12 +61,8 @@ public:
     RimEclipseCase();
     virtual ~RimEclipseCase();
 
-
     // Fields:                                        
-    caf::PdmField<bool>                         releaseResultMemory;
     caf::PdmChildArrayField<RimEclipseView*>    reservoirViews;
-    caf::PdmField<bool>                         flipXAxis;
-    caf::PdmField<bool>                         flipYAxis;
     
     std::vector<QString>                        filesContainingFaults() const;
     void                                        setFilesContainingFaults(const std::vector<QString>& val);
@@ -133,12 +129,17 @@ private:
     void                                        createTimeStepFormatString();
     virtual std::vector<Rim3dView*>             allSpecialViews() const override;
 
+protected:
+    caf::PdmField<bool>                         m_flipXAxis;
+    caf::PdmField<bool>                         m_flipYAxis;
+
 private:
+    caf::PdmField<QString>                      m_filesContainingFaultsSemColSeparated;
+    caf::PdmField<bool>                         m_releaseResultMemory;
+
     cvf::ref<RigEclipseCaseData>                m_rigEclipseCase;
     QString                                     m_timeStepFormatString;
-    std::map<QString , cvf::Color3f>            m_wellToColorMap;
-    caf::PdmField<QString >                     m_filesContainingFaultsSemColSeparated;
-
+    std::map<QString, cvf::Color3f>             m_wellToColorMap;
 
     caf::PdmChildField<RimReservoirCellResultsStorage*> m_matrixModelResults;
     caf::PdmChildField<RimReservoirCellResultsStorage*> m_fractureModelResults;
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
index d3bcae58ba..72acd5eec0 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
@@ -124,7 +124,7 @@ bool RimEclipseInputCase::openDataFileSet(const QStringList& fileNames)
 
                 this->caseUserDescription = caseName;
 
-                this->eclipseCaseData()->mainGrid()->setFlipAxis(flipXAxis, flipYAxis);
+                this->eclipseCaseData()->mainGrid()->setFlipAxis(m_flipXAxis, m_flipYAxis);
 
                 computeCachedData();
 
@@ -208,7 +208,7 @@ bool RimEclipseInputCase::openEclipseGridFile()
         results(RiaDefines::MATRIX_MODEL)->setReaderInterface(readerInterface.p());
         results(RiaDefines::FRACTURE_MODEL)->setReaderInterface(readerInterface.p());
 
-        this->eclipseCaseData()->mainGrid()->setFlipAxis(flipXAxis, flipYAxis);
+        this->eclipseCaseData()->mainGrid()->setFlipAxis(m_flipXAxis, m_flipYAxis);
         
         computeCachedData();
         loadAndSyncronizeInputProperties();
@@ -397,8 +397,8 @@ void RimEclipseInputCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
 
     auto group = uiOrdering.addNewGroup("Case Options");
     group->add(&activeFormationNames);
-    group->add(&flipXAxis);
-    group->add(&flipYAxis);
+    group->add(&m_flipXAxis);
+    group->add(&m_flipYAxis);
 
 }
 
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
index 938e799055..d96c182fe6 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
@@ -79,9 +79,9 @@ RimEclipseResultCase::RimEclipseResultCase()
     caseDirectory.xmlCapability()->setIOWritable(false); 
     caseDirectory.uiCapability()->setUiHidden(true);
 
-    flipXAxis.xmlCapability()->setIOWritable(true);
+    m_flipXAxis.xmlCapability()->setIOWritable(true);
     //flipXAxis.uiCapability()->setUiHidden(true);
-    flipYAxis.xmlCapability()->setIOWritable(true);
+    m_flipYAxis.xmlCapability()->setIOWritable(true);
     //flipYAxis.uiCapability()->setUiHidden(true);
 
     CAF_PDM_InitField(&m_sourSimFileName, "SourSimFileName", QString(), "SourSim File Name", "", "", "");
@@ -590,8 +590,8 @@ void RimEclipseResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrde
 
     auto group = uiOrdering.addNewGroup("Case Options");
     group->add(&activeFormationNames);
-    group->add(&flipXAxis);
-    group->add(&flipYAxis);
+    group->add(&m_flipXAxis);
+    group->add(&m_flipYAxis);
 
     if (eclipseCaseData()
         && eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
index 390a3be557..0c1cec3884 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
@@ -113,8 +113,8 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase()
     m_populateSelectionAfterLoadingGrid = false;
 
     // These does not work properly for statistics case, so hide for now
-    flipXAxis.uiCapability()->setUiHidden(true);
-    flipYAxis.uiCapability()->setUiHidden(true);
+    m_flipXAxis.uiCapability()->setUiHidden(true);
+    m_flipYAxis.uiCapability()->setUiHidden(true);
     activeFormationNames.uiCapability()->setUiHidden(true);
 }
 
@@ -385,8 +385,8 @@ void RimEclipseStatisticsCase::defineUiOrdering(QString uiConfigName, caf::PdmUi
     group = uiOrdering.addNewGroup("Case Options");
     group->add(&m_wellDataSourceCase);
     group->add(&activeFormationNames);
-    group->add(&flipXAxis);
-    group->add(&flipYAxis);
+    group->add(&m_flipXAxis);
+    group->add(&m_flipYAxis);
 }
 
 QList<caf::PdmOptionItemInfo> toOptionList(const QStringList& varList)