diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 8aa233ffdb..3475229391 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -39,7 +39,7 @@
 #include "RimInputCase.h"
 #include "RimReservoirView.h"
 
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigCell.h"
 #include "RigReservoirBuilderMock.h"
 
diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/Ert-Test.cpp b/ApplicationCode/FileInterface/FileInterface_UnitTests/Ert-Test.cpp
index 02324bd68a..390ec2cf56 100644
--- a/ApplicationCode/FileInterface/FileInterface_UnitTests/Ert-Test.cpp
+++ b/ApplicationCode/FileInterface/FileInterface_UnitTests/Ert-Test.cpp
@@ -37,7 +37,7 @@
 
 #include "gtest/gtest.h"
 
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RifReaderEclipseInput.h"
 
 #if 0
diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/RifReaderEclipseOutput-Test.cpp b/ApplicationCode/FileInterface/FileInterface_UnitTests/RifReaderEclipseOutput-Test.cpp
index ca210e8e0e..d1fbe43b49 100644
--- a/ApplicationCode/FileInterface/FileInterface_UnitTests/RifReaderEclipseOutput-Test.cpp
+++ b/ApplicationCode/FileInterface/FileInterface_UnitTests/RifReaderEclipseOutput-Test.cpp
@@ -21,12 +21,12 @@
 #include "RiaStdInclude.h"
 #include "gtest/gtest.h"
 
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 
 #include "RifReaderEclipseOutput.h"
 #include "ecl_file.h"
 #include "RifEclipseOutputFileTools.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 
 
 
@@ -68,7 +68,7 @@ TEST(RigReservoirTest, FileOutputToolsTest)
 
 void buildResultInfoString(RigReservoir* reservoir, RifReaderInterface::PorosityModelResultType porosityModel, RimDefines::ResultCatType resultType)
 {
-    RigReservoirCellResults* matrixResults = reservoir->results(porosityModel);
+    RigCaseCellResultsData* matrixResults = reservoir->results(porosityModel);
     {
         QStringList resultNames = matrixResults->resultNames(resultType);
 
diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
index 482f55456e..0fcbadf854 100644
--- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
@@ -18,9 +18,9 @@
 
 #include "RifEclipseInputFileTools.h"
 #include "RifReaderEclipseOutput.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "cafProgressInfo.h"
 
 #include <vector>
diff --git a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp
index 41cd834951..3836f514b8 100644
--- a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp
+++ b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp
@@ -19,8 +19,8 @@
 #include "cvfBase.h"
 
 #include "RigMainGrid.h"
-#include "RigEclipseCase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseData.h"
+#include "RigCaseCellResultsData.h"
 
 #include "RifReaderEclipseInput.h"
 #include "RifReaderEclipseOutput.h"
diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
index 5f3153b794..e7fa03c1bd 100644
--- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
+++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
@@ -19,8 +19,8 @@
 #include "cvfBase.h"
 
 #include "RigMainGrid.h"
-#include "RigEclipseCase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseData.h"
+#include "RigCaseCellResultsData.h"
 
 #include "RifReaderEclipseOutput.h"
 #include "RifEclipseOutputFileTools.h"
diff --git a/ApplicationCode/FileInterface/RifReaderMockModel.cpp b/ApplicationCode/FileInterface/RifReaderMockModel.cpp
index 659eba791f..f03a79e40f 100644
--- a/ApplicationCode/FileInterface/RifReaderMockModel.cpp
+++ b/ApplicationCode/FileInterface/RifReaderMockModel.cpp
@@ -19,7 +19,7 @@
 #include "RiaStdInclude.h"
 
 #include "RifReaderMockModel.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RifReaderInterface.h"
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.cpp b/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.cpp
index 3a29b456f1..1973d147c8 100644
--- a/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.cpp
+++ b/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.cpp
@@ -49,8 +49,8 @@
 
 #include "RigGridBase.h"
 #include "RigMainGrid.h"
-#include "RigReservoirCellResults.h"
-#include "RigEclipseCase.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
 #include "RigActiveCellInfo.h"
 
 
diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
index 23bec7646b..64e1f6437c 100644
--- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
@@ -28,8 +28,8 @@
 #include "RimResultSlot.h"
 #include "RimCellEdgeResultSlot.h"
 #include "RigGridScalarDataAccess.h"
-#include "RigReservoirCellResults.h"
-#include "RigEclipseCase.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
index f6fdb6be0a..c51ec3c230 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
@@ -21,7 +21,7 @@
 #include "RivGridPartMgr.h"
 #include "cvfStructGrid.h"
 #include "cvfModelBasicList.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
index 07fd3f524c..7f81bee176 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
@@ -20,9 +20,9 @@
 #include "RivReservoirViewPartMgr.h"
 #include "RivGridPartMgr.h"
 #include "RimReservoirView.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigGridBase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RigGridScalarDataAccess.h"
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
index 1d721e24e7..d578779940 100644
--- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
@@ -36,7 +36,7 @@
 
 #include "RimReservoirView.h"
 
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigCell.h"
 
 #include "RivPipeGeometryGenerator.h"
diff --git a/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
index 9a1227efe1..7d82f2f717 100644
--- a/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
@@ -20,7 +20,7 @@
 #include "cvfLibCore.h"
 
 #include "RimCase.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RivWellPipesPartMgr.h"
 #include "RigCell.h"
 #include "RivPipeGeometryGenerator.h"
diff --git a/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.h
index f3fc473a50..942b50866c 100644
--- a/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.h
@@ -20,7 +20,7 @@
 
 #include "cafPdmPointer.h"
 #include <list>
-#include "RigWellResults.h"
+#include "RigSingleWellResultsData.h"
 
 namespace cvf
 {
diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
index cc1b04e754..e9617def3d 100644
--- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@@ -22,9 +22,9 @@
 #include "RimReservoirView.h"
 #include "RIViewer.h"
 #include "RimCase.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigMainGrid.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 
 CAF_PDM_SOURCE_INIT(Rim3dOverlayInfoConfig, "View3dOverlayInfoConfig");
 
diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp
index 90c3a0e8d8..d7f1beae97 100644
--- a/ApplicationCode/ProjectDataModel/RimCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCase.cpp
@@ -24,9 +24,9 @@
 #include "RimCase.h"
 #include "RimReservoirView.h"
 
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigMainGrid.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 
 #include "cvfAssert.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp b/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
index 5d76d13eb9..28f638ff9d 100644
--- a/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
@@ -23,8 +23,8 @@
 #include "RimReservoirView.h"
 #include "RimCase.h"
 #include "RimReservoirView.h"
-#include "RigReservoirCellResults.h"
-#include "RigEclipseCase.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
 
 #include "cafPdmUiListEditor.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
index ec0bb22ff9..8666c153d5 100644
--- a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
@@ -22,7 +22,7 @@
 #include "RimCellPropertyFilter.h"
 #include "RimCellPropertyFilterCollection.h"
 #include "RigGridBase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 
 #include "cafPdmUiDoubleSliderEditor.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
index b722e74013..c69141e0a7 100644
--- a/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
@@ -22,7 +22,7 @@
 
 #include "RimReservoirView.h"
 #include "RigGridBase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 
 
 CAF_PDM_SOURCE_INIT(RimCellPropertyFilterCollection, "CellPropertyFilters");
diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
index 5a8b6fa7f8..965a93f78f 100644
--- a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
@@ -21,7 +21,7 @@
 #include "RimCellRangeFilter.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimReservoirView.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 
 #include "cafPdmUiSliderEditor.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
index eda15fa00f..73f90a8c7e 100644
--- a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
@@ -21,7 +21,7 @@
 #include "RimCellRangeFilterCollection.h"
 
 #include "RimReservoirView.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 
 
 
diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
index 45af3e6a51..b05b711df2 100644
--- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
+++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
@@ -22,8 +22,8 @@
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimCase.h"
 #include "RimReservoirView.h"
-#include "RigEclipseCase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseData.h"
+#include "RigCaseCellResultsData.h"
 
 #include "RimStatisticsCase.h"
 #include "RimStatisticsCaseCollection.h"
diff --git a/ApplicationCode/ProjectDataModel/RimInputCase.cpp b/ApplicationCode/ProjectDataModel/RimInputCase.cpp
index 12d5fae454..229d25dd73 100644
--- a/ApplicationCode/ProjectDataModel/RimInputCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimInputCase.cpp
@@ -24,8 +24,8 @@
 
 #include "RifReaderEclipseInput.h"
 
-#include "RigEclipseCase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseData.h"
+#include "RigCaseCellResultsData.h"
 
 #include "cvfAssert.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp
index dd26ac2313..a939da0784 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -22,8 +22,8 @@
 #include "RiaApplication.h"
 #include "RiaVersionInfo.h"
 
-#include "RigGridCollection.h"
-#include "RigEclipseCase.h"
+#include "RigGridManager.h"
+#include "RigCaseData.h"
 #include "RimResultCase.h"
 
 
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
index d005a7aef0..b88a70c3c3 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
@@ -18,7 +18,7 @@
 
 #include "RiaStdInclude.h"
 #include "RimReservoirCellResultsCacher.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RiaApplication.h"
 #include "RigMainGrid.h"
 #include "RigCell.h"
@@ -51,7 +51,7 @@ RimReservoirCellResultsStorage::~RimReservoirCellResultsStorage()
 }
 
 //--------------------------------------------------------------------------------------------------
-/// This override populates the metainfo regarding the cell results data in the RigReservoirCellResults
+/// This override populates the metainfo regarding the cell results data in the RigCaseCellResultsData
 /// object. This metainfo will then be written to the project file when saving, and thus read on project file open.
 /// This method then writes the actual double arrays to the data file in a simple format:
 /// MagicNumber<uint32>, Version<uint32>, ResultVariables< Array < TimeStep< CellDataArraySize<uint64>, CellData< Array<double > > > >
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
index 60a9a48440..ad3f02ccbd 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
@@ -22,7 +22,7 @@
 #include "RimReservoirView.h"
 #include "RIMainWindow.h"
 #include "RigGridBase.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 
@@ -32,7 +32,7 @@
 #include "RimCellRangeFilterCollection.h"
 
 #include "cvfStructGridGeometryGenerator.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RivCellEdgeEffectGenerator.h"
 #include "RimCellEdgeResultSlot.h"
 #include "cvfqtUtils.h"
diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.cpp b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
index 7dc3962cd6..4f4f7fca76 100644
--- a/ApplicationCode/ProjectDataModel/RimResultCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
@@ -18,9 +18,9 @@
 
 #include "RiaStdInclude.h"
 #include "RimResultCase.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RifReaderEclipseOutput.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RimReservoirView.h"
 #include "RifReaderMockModel.h"
 #include "RifReaderEclipseInput.h"
diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
index ad13fdc254..9af564420b 100644
--- a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
@@ -22,8 +22,8 @@
 
 #include "RimReservoirView.h"
 #include "RimCase.h"
-#include "RigReservoirCellResults.h"
-#include "RigEclipseCase.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
 #include "RigMainGrid.h"
 #include "cafPdmUiListEditor.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp
index 502ad2adb1..e50e084f43 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp
@@ -22,8 +22,8 @@
 #include "RimReservoirView.h"
 #include "cafPdmUiOrdering.h"
 #include "RimIdenticalGridCaseGroup.h"
-#include "RigEclipseCase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseData.h"
+#include "RigCaseCellResultsData.h"
 #include "RimStatisticsCaseEvaluator.h"
 #include "RigMainGrid.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
index 6f714550ca..8ce57e857e 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
@@ -18,12 +18,12 @@
 #include "RiaStdInclude.h"
 
 #include "RimStatisticsCaseEvaluator.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RimReservoirView.h"
 #include "RimCase.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 
-//#include "RigEclipseCase.h"
+//#include "RigCaseData.h"
 #include <QDebug>
 #include "cafProgressInfo.h"
 
@@ -179,7 +179,7 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<QPair<RimDefines
         QString resultName = resultSpecification[i].second;
 
         // Special handling if SOIL is asked for
-        // Build SGAS/SWAT meta data, SOIL is automatically generated as part of RigReservoirCellResults::findOrLoadScalarResultForTimeStep
+        // Build SGAS/SWAT meta data, SOIL is automatically generated as part of RigCaseCellResultsData::findOrLoadScalarResultForTimeStep
         if (resultName.toUpper() == "SOIL")
         {
             size_t swatIndex = m_sourceCases.at(0)->results(RifReaderInterface::MATRIX_RESULTS)->cellResults()->findScalarResultIndex(resultType, "SWAT");
diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
index c07efcaafb..37e0d635d4 100644
--- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
@@ -32,7 +32,7 @@
 #include "RifEclipseInputFileTools.h"
 #include "RimInputCase.h"
 #include "RimBinaryExportSettings.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RimStatisticsCase.h"
 #include "RimResultCase.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimWell.h b/ApplicationCode/ProjectDataModel/RimWell.h
index d2b136cff4..a9f18b1ea7 100644
--- a/ApplicationCode/ProjectDataModel/RimWell.h
+++ b/ApplicationCode/ProjectDataModel/RimWell.h
@@ -24,7 +24,7 @@
 #include "cafAppEnum.h"
 #include "cafPdmFieldCvfColor.h"
 
-#include "RigWellResults.h"
+#include "RigSingleWellResultsData.h"
 
 class RimReservoirView;
 //==================================================================================================
diff --git a/ApplicationCode/ProjectDataModel/RimWellCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellCollection.cpp
index 9258bcc7b9..d1fd3f5ba0 100644
--- a/ApplicationCode/ProjectDataModel/RimWellCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellCollection.cpp
@@ -22,7 +22,7 @@
 #include "cafAppEnum.h"
 #include "cafPdmFieldCvfColor.h"
 
-#include "RigWellResults.h"
+#include "RigSingleWellResultsData.h"
 #include "RimWellCollection.h"
 #include "RimWell.h"
 #include "RimReservoirView.h"
diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
index 5239d1e831..71c1ec37e7 100644
--- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
@@ -8,29 +8,29 @@ endif()
 list(APPEND CODE_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.h
 ${CEE_CURRENT_LIST_DIR}RigCell.h
-${CEE_CURRENT_LIST_DIR}RigEclipseCase.h
+${CEE_CURRENT_LIST_DIR}RigCaseData.h
 ${CEE_CURRENT_LIST_DIR}RigGridBase.h
-${CEE_CURRENT_LIST_DIR}RigGridCollection.h
+${CEE_CURRENT_LIST_DIR}RigGridManager.h
 ${CEE_CURRENT_LIST_DIR}RigGridScalarDataAccess.h
 ${CEE_CURRENT_LIST_DIR}RigLocalGrid.h
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.h
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h
-${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.h
-${CEE_CURRENT_LIST_DIR}RigWellResults.h
+${CEE_CURRENT_LIST_DIR}RigCaseCellResultsData.h
+${CEE_CURRENT_LIST_DIR}RigSingleWellResultsData.h
 )
 
 list(APPEND CODE_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.cpp
 ${CEE_CURRENT_LIST_DIR}RigCell.cpp
-${CEE_CURRENT_LIST_DIR}RigEclipseCase.cpp
+${CEE_CURRENT_LIST_DIR}RigCaseData.cpp
 ${CEE_CURRENT_LIST_DIR}RigGridBase.cpp
-${CEE_CURRENT_LIST_DIR}RigGridCollection.cpp
+${CEE_CURRENT_LIST_DIR}RigGridManager.cpp
 ${CEE_CURRENT_LIST_DIR}RigGridScalarDataAccess.cpp
 ${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp
-${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.cpp
-${CEE_CURRENT_LIST_DIR}RigWellResults.cpp
+${CEE_CURRENT_LIST_DIR}RigCaseCellResultsData.cpp
+${CEE_CURRENT_LIST_DIR}RigSingleWellResultsData.cpp
 )
 
 
diff --git a/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigReservoir-Test.cpp b/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigReservoir-Test.cpp
index e89724299d..5fe9cd233b 100644
--- a/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigReservoir-Test.cpp
+++ b/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigReservoir-Test.cpp
@@ -21,8 +21,8 @@
 #include "RiaStdInclude.h"
 #include "gtest/gtest.h"
 
-#include "RigEclipseCase.h"
-#include "RigGridCollection.h"
+#include "RigCaseData.h"
+#include "RigGridManager.h"
 
 
 //--------------------------------------------------------------------------------------------------
@@ -96,7 +96,7 @@ TEST(RigGridManager, EqualTests)
 //--------------------------------------------------------------------------------------------------
 TEST(RigReservoirTest, BasicTest)
 {
-    cvf::ref<RigWellResults> wellCellTimeHistory = new RigWellResults;
+    cvf::ref<RigSingleWellResultsData> wellCellTimeHistory = new RigSingleWellResultsData;
 
     QDateTime wellStartTime = QDateTime::currentDateTime();
 
diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
similarity index 99%
rename from ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp
rename to ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
index 115ad0a66a..517aca7693 100644
--- a/ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RifReaderInterface.h"
 #include "RigMainGrid.h"
 
diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirCellResults.h b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
similarity index 100%
rename from ApplicationCode/ReservoirDataModel/RigReservoirCellResults.h
rename to ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp
similarity index 99%
rename from ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
rename to ApplicationCode/ReservoirDataModel/RigCaseData.cpp
index 76b3617dd0..b10a189744 100644
--- a/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp
@@ -16,9 +16,9 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigMainGrid.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RigGridScalarDataAccess.h"
 
 //--------------------------------------------------------------------------------------------------
@@ -474,7 +474,7 @@ cvf::ref<cvf::StructGridScalarDataAccess> RigCaseData::dataAccessObject(const Ri
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigEclipseCase::closeReaderInterface()
+void RigCaseData::closeReaderInterface()
 {
     RifReaderInterface* readerInterface = m_matrixModelResults->readerInterface();
 
diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseCase.h b/ApplicationCode/ReservoirDataModel/RigCaseData.h
similarity index 99%
rename from ApplicationCode/ReservoirDataModel/RigEclipseCase.h
rename to ApplicationCode/ReservoirDataModel/RigCaseData.h
index 04900460a8..866dec4819 100644
--- a/ApplicationCode/ReservoirDataModel/RigEclipseCase.h
+++ b/ApplicationCode/ReservoirDataModel/RigCaseData.h
@@ -24,7 +24,7 @@
 #include "cvfAssert.h"
 #include "cvfObject.h"
 #include "RigMainGrid.h"
-#include "RigWellResults.h"
+#include "RigSingleWellResultsData.h"
 #include "RigActiveCellInfo.h"
 
 class RigCaseCellResultsData;
diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp
index 69b62a8856..77946bd15e 100644
--- a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp
@@ -19,7 +19,7 @@
 #include "RigGridBase.h"
 #include "RigMainGrid.h"
 #include "RigCell.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RigGridScalarDataAccess.h"
 
 #include "cvfAssert.h"
diff --git a/ApplicationCode/ReservoirDataModel/RigGridCollection.cpp b/ApplicationCode/ReservoirDataModel/RigGridManager.cpp
similarity index 98%
rename from ApplicationCode/ReservoirDataModel/RigGridCollection.cpp
rename to ApplicationCode/ReservoirDataModel/RigGridManager.cpp
index 61812211a6..2c7fbbba91 100644
--- a/ApplicationCode/ReservoirDataModel/RigGridCollection.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigGridManager.cpp
@@ -16,8 +16,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigGridCollection.h"
-#include "RigEclipseCase.h"
+#include "RigGridManager.h"
+#include "RigCaseData.h"
 #include "RigMainGrid.h"
 
 
diff --git a/ApplicationCode/ReservoirDataModel/RigGridCollection.h b/ApplicationCode/ReservoirDataModel/RigGridManager.h
similarity index 100%
rename from ApplicationCode/ReservoirDataModel/RigGridCollection.h
rename to ApplicationCode/ReservoirDataModel/RigGridManager.h
diff --git a/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp b/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp
index 8377a35c67..68136b67d0 100644
--- a/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp
@@ -25,10 +25,10 @@
 #include "cvfAssert.h"
 
 #include "RigMainGrid.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RigActiveCellInfo.h"
 #include "RigGridBase.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include <math.h>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
index 6f2dfccfb5..74671abf98 100644
--- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigReservoirBuilderMock.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigActiveCellInfo.h"
 
 
diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h
index c22bfbd926..d6c0f0fec4 100644
--- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h
+++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h
@@ -23,7 +23,7 @@
 #include "cvfArray.h"
 #include "cvfVector3.h"
 #include "RigCell.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 
 class LocalGridRefinement
 {
diff --git a/ApplicationCode/ReservoirDataModel/RigWellResults.cpp b/ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
similarity index 99%
rename from ApplicationCode/ReservoirDataModel/RigWellResults.cpp
rename to ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
index a52fea4430..a36cf5752f 100644
--- a/ApplicationCode/ReservoirDataModel/RigWellResults.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigWellResults.h"
+#include "RigSingleWellResultsData.h"
 #include <map>
 
 #include <QDebug>
diff --git a/ApplicationCode/ReservoirDataModel/RigWellResults.h b/ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.h
similarity index 100%
rename from ApplicationCode/ReservoirDataModel/RigWellResults.h
rename to ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.h
diff --git a/ApplicationCode/SocketInterface/RiaSocketServer.cpp b/ApplicationCode/SocketInterface/RiaSocketServer.cpp
index 7bf70e3f27..4acb24ccf6 100644
--- a/ApplicationCode/SocketInterface/RiaSocketServer.cpp
+++ b/ApplicationCode/SocketInterface/RiaSocketServer.cpp
@@ -26,8 +26,8 @@
 #include "RiaApplication.h"
 #include "RIMainWindow.h"
 #include "RimCase.h"
-#include "RigEclipseCase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseData.h"
+#include "RigCaseCellResultsData.h"
 #include "RimInputProperty.h"
 #include "RimInputCase.h"
 #include "RimUiTreeModelPdm.h"
diff --git a/ApplicationCode/UserInterface/RIMainWindow.cpp b/ApplicationCode/UserInterface/RIMainWindow.cpp
index 846bbf64ed..3bbe25ad1e 100644
--- a/ApplicationCode/UserInterface/RIMainWindow.cpp
+++ b/ApplicationCode/UserInterface/RIMainWindow.cpp
@@ -27,8 +27,8 @@
 #include "RiaPreferences.h"
 #include "RIPreferencesDialog.h"
 
-#include "RigEclipseCase.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseData.h"
+#include "RigCaseCellResultsData.h"
 #include "RimCase.h"
 #include "RimUiTreeModelPdm.h"
 
diff --git a/ApplicationCode/UserInterface/RIViewer.cpp b/ApplicationCode/UserInterface/RIViewer.cpp
index f0eb28fd66..ddac6c550d 100644
--- a/ApplicationCode/UserInterface/RIViewer.cpp
+++ b/ApplicationCode/UserInterface/RIViewer.cpp
@@ -28,7 +28,7 @@
 #include "cvfRendering.h"
 #include "cvfDrawableGeo.h"
 #include "RICursors.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 
 #include "cafUtils.h"
 #include "cafFrameAnimationControl.h"