diff --git a/ApplicationCode/FileInterface/RifEclipseExportTools.cpp b/ApplicationCode/FileInterface/RifEclipseExportTools.cpp
index f3bd933add..439a62662d 100644
--- a/ApplicationCode/FileInterface/RifEclipseExportTools.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseExportTools.cpp
@@ -289,7 +289,7 @@ void RifEclipseExportTools::printStimPlanCellsMatrixTransContributions(const std
                 //continue;
             }
 
-            RigFractureStimPlanCellData fracStimPlanCellData(stimPlanCell.getI(), stimPlanCell.getJ());
+            RigStimPlanFractureCell fracStimPlanCellData(stimPlanCell.getI(), stimPlanCell.getJ());
 
 
             transmissibilityCalculator.calculateStimPlanCellsMatrixTransmissibility(&stimPlanCell, &fracStimPlanCellData);
diff --git a/ApplicationCode/ReservoirDataModel/RigFracture.cpp b/ApplicationCode/ReservoirDataModel/RigFracture.cpp
index 6b52540413..a9d88664a7 100644
--- a/ApplicationCode/ReservoirDataModel/RigFracture.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigFracture.cpp
@@ -29,7 +29,7 @@ RigFractureData::RigFractureData()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RigFractureStimPlanCellData::RigFractureStimPlanCellData(size_t i, size_t j)
+RigStimPlanFractureCell::RigStimPlanFractureCell(size_t i, size_t j)
 {
     m_i = i;
     m_j = j;
@@ -38,7 +38,7 @@ RigFractureStimPlanCellData::RigFractureStimPlanCellData(size_t i, size_t j)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigFractureStimPlanCellData::addContributingEclipseCell(size_t eclipseCell, double transmissibility)
+void RigStimPlanFractureCell::addContributingEclipseCell(size_t eclipseCell, double transmissibility)
 {
     contributingEclipseCells.push_back(eclipseCell);
     contributingEclipseCellTransmissibilities.push_back(transmissibility);
@@ -95,7 +95,7 @@ const std::vector<RigFractureData>& RigFracture::fractureData() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigFracture::addStimPlanCellFractureCell(RigFractureStimPlanCellData fracStimPlanCellData)
+void RigFracture::addStimPlanCellFractureCell(RigStimPlanFractureCell fracStimPlanCellData)
 {
     m_stimPlanCellsFractureData.push_back(fracStimPlanCellData);
 }
diff --git a/ApplicationCode/ReservoirDataModel/RigFracture.h b/ApplicationCode/ReservoirDataModel/RigFracture.h
index b1ea6f56b7..cd8f2457ed 100644
--- a/ApplicationCode/ReservoirDataModel/RigFracture.h
+++ b/ApplicationCode/ReservoirDataModel/RigFracture.h
@@ -52,10 +52,10 @@ public:
 };
 
 
-class RigFractureStimPlanCellData
+class RigStimPlanFractureCell
 {
 public:
-    RigFractureStimPlanCellData(size_t i, size_t j);
+    RigStimPlanFractureCell(size_t i, size_t j);
 
     size_t                  m_i;
     size_t                  m_j;
@@ -92,13 +92,13 @@ public:
 
     std::vector<RigFractureData> m_fractureData;
 
-    void addStimPlanCellFractureCell(RigFractureStimPlanCellData fracStimPlanCellData);
+    void addStimPlanCellFractureCell(RigStimPlanFractureCell fracStimPlanCellData);
 
 private:
     std::vector<cvf::uint>  m_triangleIndices;
     std::vector<cvf::Vec3f> m_nodeCoords;
 
-    std::vector<RigFractureStimPlanCellData>    m_stimPlanCellsFractureData;
+    std::vector<RigStimPlanFractureCell>    m_stimPlanCellsFractureData;
     std::vector<size_t>                         m_perforatedStimPlanCellsIndex;
 };
 
diff --git a/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp b/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp
index 10c4eb12bc..fd719e104d 100644
--- a/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp
@@ -246,7 +246,7 @@ void RigFractureTransCalc::computeTransmissibilityFromPolygonWithInfiniteConduct
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigFractureTransCalc::calculateStimPlanCellsMatrixTransmissibility(RigStimPlanCell* stimPlanCell, RigFractureStimPlanCellData* fracStimPlanCellData)
+void RigFractureTransCalc::calculateStimPlanCellsMatrixTransmissibility(RigStimPlanCell* stimPlanCell, RigStimPlanFractureCell* fracStimPlanCellData)
 {
 
     //Not calculating flow into fracture if stimPlan cell cond value is 0 (assumed to be outside the fracture):
diff --git a/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h b/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h
index 488f5ed1d5..bcde31fe69 100644
--- a/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h
+++ b/ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h
@@ -36,7 +36,7 @@ class RimFracture;
 class RimEclipseCase;
 class RigStimPlanCell;
 class RimStimPlanFractureTemplate;
-class RigFractureStimPlanCellData;
+class RigStimPlanFractureCell;
 
 //==================================================================================================
 /// 
@@ -59,7 +59,7 @@ public:
     static double               arithmeticAverage(std::vector<double> values);
 
     // Calculations based on StimPlan grid
-    void                        calculateStimPlanCellsMatrixTransmissibility(RigStimPlanCell* stimPlanCell, RigFractureStimPlanCellData* fracStimPlanCellData);
+    void                        calculateStimPlanCellsMatrixTransmissibility(RigStimPlanCell* stimPlanCell, RigStimPlanFractureCell* fracStimPlanCellData);
     static void                 computeStimPlanCellTransmissibilityInFracture(const RigStimPlanCell&  stimPlanCell);
     double                      computeRadialTransmissibilityToWellinStimPlanCell(const RigStimPlanCell&  stimPlanCell);
     double                      computeLinearTransmissibilityToWellinStimPlanCell(const RigStimPlanCell&  stimPlanCell, double perforationLengthVertical, double perforationLengthHorizontal);