diff --git a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp
index 560284cf52..9b335faacd 100644
--- a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp
@@ -25,7 +25,7 @@
 #include "RimFracture.h"
 #include "RimFractureTemplate.h"
 #include "RimLegendConfig.h"
-#include "RimStimPlanCell.h"
+#include "RigStimPlanCell.h"
 #include "RimStimPlanColors.h"
 #include "RimStimPlanFractureTemplate.h"
 
@@ -290,10 +290,10 @@ cvf::ref<cvf::DrawableGeo> RivWellFracturePartMgr::createStimPlanMeshDrawable(Ri
     QString resultUnit = "md-m";
     size_t timeStepIndex = 0;
 
-    std::vector<RimStimPlanCell* > stimPlanCells = stimPlanFracTemplate->getStimPlanCells(resultName, resultUnit, timeStepIndex);
+    std::vector<RigStimPlanCell* > stimPlanCells = stimPlanFracTemplate->getStimPlanCells(resultName, resultUnit, timeStepIndex);
     std::vector<cvf::Vec3f> stimPlanMeshVertices;
 
-    for (RimStimPlanCell* stimPlanCell : stimPlanCells)
+    for (RigStimPlanCell* stimPlanCell : stimPlanCells)
     {
         if (stimPlanCell->getValue() > 1e-7)
         {
diff --git a/ApplicationCode/ProjectDataModel/RimStimPlanCell.cpp b/ApplicationCode/ProjectDataModel/RigStimPlanCell.cpp
similarity index 90%
rename from ApplicationCode/ProjectDataModel/RimStimPlanCell.cpp
rename to ApplicationCode/ProjectDataModel/RigStimPlanCell.cpp
index 4901f1958a..01e46892a0 100644
--- a/ApplicationCode/ProjectDataModel/RimStimPlanCell.cpp
+++ b/ApplicationCode/ProjectDataModel/RigStimPlanCell.cpp
@@ -16,12 +16,12 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimStimPlanCell.h"
+#include "RigStimPlanCell.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimStimPlanCell::RimStimPlanCell()
+RigStimPlanCell::RigStimPlanCell()
 {
 
 }
@@ -29,7 +29,7 @@ RimStimPlanCell::RimStimPlanCell()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimStimPlanCell::RimStimPlanCell(std::vector<cvf::Vec3d> polygon, double value, size_t i, size_t j)
+RigStimPlanCell::RigStimPlanCell(std::vector<cvf::Vec3d> polygon, double value, size_t i, size_t j)
 {
     m_polygon = polygon;
     m_value = value;
@@ -40,7 +40,7 @@ RimStimPlanCell::RimStimPlanCell(std::vector<cvf::Vec3d> polygon, double value,
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimStimPlanCell::~RimStimPlanCell()
+RigStimPlanCell::~RigStimPlanCell()
 {
 
 }
diff --git a/ApplicationCode/ProjectDataModel/RimStimPlanCell.h b/ApplicationCode/ProjectDataModel/RigStimPlanCell.h
similarity index 91%
rename from ApplicationCode/ProjectDataModel/RimStimPlanCell.h
rename to ApplicationCode/ProjectDataModel/RigStimPlanCell.h
index 795fccc053..101b67c72f 100644
--- a/ApplicationCode/ProjectDataModel/RimStimPlanCell.h
+++ b/ApplicationCode/ProjectDataModel/RigStimPlanCell.h
@@ -27,15 +27,15 @@
 ///  
 ///  
 //==================================================================================================
-class RimStimPlanCell 
+class RigStimPlanCell 
 {
 
 public:
-    RimStimPlanCell();
-    RimStimPlanCell(std::vector<cvf::Vec3d> polygon, double value, size_t i, size_t j);
+    RigStimPlanCell();
+    RigStimPlanCell(std::vector<cvf::Vec3d> polygon, double value, size_t i, size_t j);
 
 
-    virtual ~RimStimPlanCell();
+    virtual ~RigStimPlanCell();
 
     std::vector<cvf::Vec3d> getPolygon() { return m_polygon; }
     double                  getValue() { return m_value; }
diff --git a/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
index 1e4cf4e721..331084afde 100644
--- a/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
@@ -26,7 +26,7 @@
 #include "RimEclipseView.h"
 #include "RimFracture.h"
 #include "RimProject.h"
-#include "RimStimPlanCell.h"
+#include "RigStimPlanCell.h"
 #include "RimStimPlanColors.h"
 #include "RimStimPlanLegendConfig.h"
 
@@ -773,9 +773,9 @@ void RimStimPlanFractureTemplate::getStimPlanDataAsPolygonsAndValues(std::vector
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimStimPlanCell*> RimStimPlanFractureTemplate::getStimPlanCells(const QString& resultName, const QString& unitName, size_t timeStepIndex)
+std::vector<RigStimPlanCell*> RimStimPlanFractureTemplate::getStimPlanCells(const QString& resultName, const QString& unitName, size_t timeStepIndex)
 {
-    std::vector<RimStimPlanCell*> stimPlanCells;
+    std::vector<RigStimPlanCell*> stimPlanCells;
 
     std::vector<std::vector<double>> propertyValuesAtTimeStep = getMirroredDataAtTimeIndex(resultName, unitName, timeStepIndex);
     std::vector<double> depthCoordsAtNodes = adjustedDepthCoordsAroundWellPathPosition();
@@ -796,7 +796,7 @@ std::vector<RimStimPlanCell*> RimStimPlanFractureTemplate::getStimPlanCells(cons
             cellPolygon.push_back(cvf::Vec3d(static_cast<float>(xCoords[i + 1]), static_cast<float>(depthCoords[j + 1]), 0.0));
             cellPolygon.push_back(cvf::Vec3d(static_cast<float>(xCoords[i]), static_cast<float>(depthCoords[j + 1]), 0.0));
 
-            RimStimPlanCell* stimPlanCell = new RimStimPlanCell(cellPolygon, propertyValuesAtTimeStep[j + 1][i + 1], i, j);
+            RigStimPlanCell* stimPlanCell = new RigStimPlanCell(cellPolygon, propertyValuesAtTimeStep[j + 1][i + 1], i, j);
             stimPlanCells.push_back(stimPlanCell);
         }
     }
diff --git a/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h b/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h
index 79e4942f25..03a49e682c 100644
--- a/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h
+++ b/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h
@@ -35,7 +35,7 @@
 
 class RigStimPlanFractureDefinition;
 class RimStimPlanLegendConfig;
-class RimStimPlanCell;
+class RigStimPlanCell;
 
 //==================================================================================================
 ///  
@@ -76,7 +76,7 @@ public:
     void                                    computeMinMax(const QString& resultName, const QString& unitName, double* minValue, double* maxValue) const;
     
     void                                    getStimPlanDataAsPolygonsAndValues(std::vector<std::vector<cvf::Vec3d> > &cellsAsPolygons, std::vector<double> &parameterValue, const QString& resultName, const QString& unitName, size_t timeStepIndex);
-    std::vector<RimStimPlanCell*>           getStimPlanCells(const QString& resultName, const QString& unitName, size_t timeStepIndex);
+    std::vector<RigStimPlanCell*>           getStimPlanCells(const QString& resultName, const QString& unitName, size_t timeStepIndex);
     std::vector<cvf::Vec3d>                 getStimPlanRowPolygon(size_t i);
     std::vector<cvf::Vec3d>                 getStimPlanColPolygon(size_t j);
 
diff --git a/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp b/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp
index 860032e7b4..3b66dbbc77 100644
--- a/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp
@@ -38,7 +38,7 @@
 #include "RigMainGrid.h"
 #include "cvfMath.h"
 #include "RimDefines.h"
-#include "RimStimPlanCell.h"
+#include "RigStimPlanCell.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -326,7 +326,7 @@ std::pair<double, double> RigFractureTransCalc::flowAcrossLayersUpscaling(QStrin
     }
     else return std::make_pair(cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE);
 
-    std::vector<RimStimPlanCell* > stimPlanCells = fracTemplateStimPlan->getStimPlanCells(resultName, resultUnit, timeStepIndex);
+    std::vector<RigStimPlanCell* > stimPlanCells = fracTemplateStimPlan->getStimPlanCells(resultName, resultUnit, timeStepIndex);
 
 //     RifReaderInterface::PorosityModelResultType porosityModel = RifReaderInterface::MATRIX_RESULTS;
 //     RimReservoirCellResultsStorage* gridCellResults = m_case->results(porosityModel);
@@ -382,7 +382,7 @@ std::pair<double, double> RigFractureTransCalc::flowAcrossLayersUpscaling(QStrin
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-double RigFractureTransCalc::computeHAupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RimStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers)
+double RigFractureTransCalc::computeHAupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RigStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers)
 {
     std::vector<double> DcolSum;
     std::vector<double> lavgCol;
@@ -394,8 +394,8 @@ double RigFractureTransCalc::computeHAupscale(RimStimPlanFractureTemplate* fracT
         std::vector<double> lengthsLiOfStimPlanCol;
         std::vector<double> heightsDiOfStimPlanCells;
 
-        std::vector<RimStimPlanCell*> stimPlanCellsCol = getColOfStimPlanCells(stimPlanCells, j);
-        for (RimStimPlanCell* stimPlanCell : stimPlanCellsCol)
+        std::vector<RigStimPlanCell*> stimPlanCellsCol = getColOfStimPlanCells(stimPlanCells, j);
+        for (RigStimPlanCell* stimPlanCell : stimPlanCellsCol)
         {
             if (stimPlanCell->getValue() > 1e-7)
             {
@@ -450,7 +450,7 @@ double RigFractureTransCalc::computeHAupscale(RimStimPlanFractureTemplate* fracT
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-double RigFractureTransCalc::computeAHupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RimStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers)
+double RigFractureTransCalc::computeAHupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RigStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers)
 {
     std::vector<double> DcolAvg;
     std::vector<double> liColSum;
@@ -462,8 +462,8 @@ double RigFractureTransCalc::computeAHupscale(RimStimPlanFractureTemplate* fracT
         std::vector<double> lengthsLiOfStimPlanCol;
         std::vector<double> heightsDiOfStimPlanCells;
 
-        std::vector<RimStimPlanCell*> stimPlanCellsCol = getColOfStimPlanCells(stimPlanCells, j);
-        for (RimStimPlanCell* stimPlanCell : stimPlanCellsCol)
+        std::vector<RigStimPlanCell*> stimPlanCellsCol = getColOfStimPlanCells(stimPlanCells, j);
+        for (RigStimPlanCell* stimPlanCell : stimPlanCellsCol)
         {
             if (stimPlanCell->getValue() > 1e-7)
             {
@@ -693,11 +693,11 @@ void RigFractureTransCalc::computeFlowIntoTransverseWell()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimStimPlanCell*> RigFractureTransCalc::getRowOfStimPlanCells(std::vector<RimStimPlanCell*> allStimPlanCells, size_t i)
+std::vector<RigStimPlanCell*> RigFractureTransCalc::getRowOfStimPlanCells(std::vector<RigStimPlanCell*> allStimPlanCells, size_t i)
 {
-    std::vector<RimStimPlanCell*> stimPlanCellRow;
+    std::vector<RigStimPlanCell*> stimPlanCellRow;
 
-    for (RimStimPlanCell* stimPlanCell : allStimPlanCells)
+    for (RigStimPlanCell* stimPlanCell : allStimPlanCells)
     {
         if (stimPlanCell->getI() == i)
         {
@@ -711,11 +711,11 @@ std::vector<RimStimPlanCell*> RigFractureTransCalc::getRowOfStimPlanCells(std::v
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimStimPlanCell*> RigFractureTransCalc::getColOfStimPlanCells(std::vector<RimStimPlanCell*> allStimPlanCells, size_t j)
+std::vector<RigStimPlanCell*> RigFractureTransCalc::getColOfStimPlanCells(std::vector<RigStimPlanCell*> allStimPlanCells, size_t j)
 {
-    std::vector<RimStimPlanCell*> stimPlanCellCol;
+    std::vector<RigStimPlanCell*> stimPlanCellCol;
 
-    for (RimStimPlanCell* stimPlanCell : allStimPlanCells)
+    for (RigStimPlanCell* stimPlanCell : allStimPlanCells)
     {
         if (stimPlanCell->getJ() == j)
         {
diff --git a/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h b/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h
index 550101c6b7..a64bcbc6a3 100644
--- a/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h
+++ b/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h
@@ -34,7 +34,7 @@
 
 class RimFracture;
 class RimEclipseCase;
-class RimStimPlanCell;
+class RigStimPlanCell;
 class RimStimPlanFractureTemplate;
 
 //==================================================================================================
@@ -51,8 +51,8 @@ public:
 
     void                        computeUpscaledPropertyFromStimPlan(QString resultName, QString resultUnit, size_t timeStepIndex);  
     std::pair<double, double>   flowAcrossLayersUpscaling(QString resultName, QString resultUnit, size_t timeStepIndex, RimDefines::UnitSystem unitSystem, size_t eclipseCellIndex);
-    double                      computeHAupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RimStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers);
-    double                      computeAHupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RimStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers);
+    double                      computeHAupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RigStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers);
+    double                      computeAHupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RigStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers);
 
     static double               arithmeticAverage(std::vector<double> values);
 
@@ -60,8 +60,8 @@ public:
     void                        computeFlowIntoTransverseWell();
 
 
-    static std::vector<RimStimPlanCell*>    getRowOfStimPlanCells(std::vector<RimStimPlanCell*> allStimPlanCells, size_t i);
-    static std::vector<RimStimPlanCell*>    getColOfStimPlanCells(std::vector<RimStimPlanCell*> allStimPlanCells, size_t j);
+    static std::vector<RigStimPlanCell*>    getRowOfStimPlanCells(std::vector<RigStimPlanCell*> allStimPlanCells, size_t i);
+    static std::vector<RigStimPlanCell*>    getColOfStimPlanCells(std::vector<RigStimPlanCell*> allStimPlanCells, size_t j);
 
 
 private: