diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
index 1ac71e96dc..5409f8e8f5 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
@@ -20,7 +20,7 @@
 
 #include "RiaApplication.h"
 
-#include "RimCalculation.h"
+#include "RimSummaryCalculation.h"
 #include "RimCalculationCollection.h"
 #include "RimProject.h"
 
@@ -70,7 +70,7 @@ QString RicSummaryCurveCalculator::calulationGroupName()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCalculation* RicSummaryCurveCalculator::currentCalculation() const
+RimSummaryCalculation* RicSummaryCurveCalculator::currentCalculation() const
 {
     return m_currentCalculation();
 }
@@ -109,7 +109,7 @@ void RicSummaryCurveCalculator::fieldChangedByUi(const caf::PdmFieldHandle* chan
     {
         m_newCalculation = false;
 
-        RimCalculation* rimCalc = calculationCollection()->addCalculation();
+        RimSummaryCalculation* rimCalc = calculationCollection()->addCalculation();
         m_currentCalculation = rimCalc;
 
         this->updateConnectedEditors();
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h
index 765bdf5631..b83bd28acb 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h
@@ -24,7 +24,7 @@
 #include "cafPdmPtrField.h"
 
 class RimCalculationCollection;
-class RimCalculation;
+class RimSummaryCalculation;
 
 //==================================================================================================
 /// 
@@ -39,7 +39,7 @@ public:
     static QString  calculatedSummariesGroupName();
     static QString  calulationGroupName();
 
-    RimCalculation* currentCalculation() const;
+    RimSummaryCalculation* currentCalculation() const;
 
     bool            parseExpression() const;
     bool            calculate() const;
@@ -58,7 +58,7 @@ private:
     static void assignPushButtonEditorText(caf::PdmUiEditorAttribute* attribute, const QString& text);
 
 private:
-    caf::PdmPtrField<RimCalculation*>   m_currentCalculation;
+    caf::PdmPtrField<RimSummaryCalculation*>   m_currentCalculation;
     
     caf::PdmField<bool>                 m_newCalculation;
     caf::PdmField<bool>                 m_deleteCalculation;
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
index 9de333ea68..dff44b0a41 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
@@ -19,7 +19,7 @@
 #include "RicSummaryCurveCalculatorEditor.h"
 
 #include "RicSummaryCurveCalculator.h"
-#include "RimCalculation.h"
+#include "RimSummaryCalculation.h"
 
 #include "cafPdmUiTableView.h"
 
diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
index 9feabc5c4b..cc666628a8 100644
--- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
@@ -92,7 +92,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.h
 ${CEE_CURRENT_LIST_DIR}RimDialogData.h
 ${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.h
-${CEE_CURRENT_LIST_DIR}RimCalculation.h
+${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.h
 ${CEE_CURRENT_LIST_DIR}RimCalculationCollection.h
 ${CEE_CURRENT_LIST_DIR}RimCalculationVariable.h
 )
@@ -192,7 +192,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.cpp
 ${CEE_CURRENT_LIST_DIR}RimDialogData.cpp
 ${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.cpp
-${CEE_CURRENT_LIST_DIR}RimCalculation.cpp
+${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.cpp
 ${CEE_CURRENT_LIST_DIR}RimCalculationCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimCalculationVariable.cpp
 )
diff --git a/ApplicationCode/ProjectDataModel/RimCalculationCollection.cpp b/ApplicationCode/ProjectDataModel/RimCalculationCollection.cpp
index 9a87543bb6..95904782f7 100644
--- a/ApplicationCode/ProjectDataModel/RimCalculationCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCalculationCollection.cpp
@@ -18,7 +18,7 @@
 
 #include "RimCalculationCollection.h"
 
-#include "RimCalculation.h"
+#include "RimSummaryCalculation.h"
 #include "RimCalculatedSummaryCase.h"
 
 #include "cafPdmUiGroup.h"
@@ -44,9 +44,9 @@ RimCalculationCollection::RimCalculationCollection()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCalculation* RimCalculationCollection::addCalculation()
+RimSummaryCalculation* RimCalculationCollection::addCalculation()
 {
-    RimCalculation* calculation = new RimCalculation;
+    RimSummaryCalculation* calculation = new RimSummaryCalculation;
     calculation->setDescription(QString("Calculation %1").arg(m_calcuations.size()));
 
     m_calcuations.push_back(calculation);
@@ -59,7 +59,7 @@ RimCalculation* RimCalculationCollection::addCalculation()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCalculationCollection::deleteCalculation(RimCalculation* calculation)
+void RimCalculationCollection::deleteCalculation(RimSummaryCalculation* calculation)
 {
     m_calcuations.removeChildObject(calculation);
 
@@ -71,9 +71,9 @@ void RimCalculationCollection::deleteCalculation(RimCalculation* calculation)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimCalculation*> RimCalculationCollection::calculations() const
+std::vector<RimSummaryCalculation*> RimCalculationCollection::calculations() const
 {
-    std::vector<RimCalculation*> calcs;
+    std::vector<RimSummaryCalculation*> calcs;
 
     for (auto c : m_calcuations)
     {
diff --git a/ApplicationCode/ProjectDataModel/RimCalculationCollection.h b/ApplicationCode/ProjectDataModel/RimCalculationCollection.h
index 3cd4b58c60..9f1c7fa806 100644
--- a/ApplicationCode/ProjectDataModel/RimCalculationCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimCalculationCollection.h
@@ -22,7 +22,7 @@
 #include "cafPdmChildArrayField.h"
 #include "cafPdmChildField.h"
 
-class RimCalculation;
+class RimSummaryCalculation;
 class RimSummaryCase;
 class RimCalculatedSummaryCase;
 
@@ -37,9 +37,9 @@ class RimCalculationCollection : public caf::PdmObject
 public:
     RimCalculationCollection();
 
-    RimCalculation*                 addCalculation();
-    void                            deleteCalculation(RimCalculation* calculation);
-    std::vector<RimCalculation*>    calculations() const;
+    RimSummaryCalculation*                 addCalculation();
+    void                            deleteCalculation(RimSummaryCalculation* calculation);
+    std::vector<RimSummaryCalculation*>    calculations() const;
 
     RimSummaryCase*                 calculationSummaryCase();
 
@@ -50,6 +50,6 @@ private:
     virtual void                    initAfterRead() override;
 
 private:
-    caf::PdmChildArrayField<RimCalculation*>        m_calcuations;
+    caf::PdmChildArrayField<RimSummaryCalculation*>        m_calcuations;
     caf::PdmChildField<RimCalculatedSummaryCase*>   m_calcuationSummaryCase;
 };
diff --git a/ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp b/ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp
index 039de78b53..daa2c56367 100644
--- a/ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp
@@ -28,7 +28,7 @@
 
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTableView.h"
-#include "RimCalculation.h"
+#include "RimSummaryCalculation.h"
 
 
 CAF_PDM_SOURCE_INIT(RimCalculationVariable, "RimCalculationVariable");
@@ -108,7 +108,7 @@ void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changed
 
         if (updateContainingEditor)
         {
-            RimCalculation* rimCalculation = nullptr;
+            RimSummaryCalculation* rimCalculation = nullptr;
             this->firstAncestorOrThisOfTypeAsserted(rimCalculation);
 
             // RimCalculation is pointed to by RicSummaryCurveCalculator in a PtrField
diff --git a/ApplicationCode/ProjectDataModel/RimCalculation.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
similarity index 89%
rename from ApplicationCode/ProjectDataModel/RimCalculation.cpp
rename to ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
index 4b4f1bcd25..31ae165de9 100644
--- a/ApplicationCode/ProjectDataModel/RimCalculation.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimCalculation.h"
+#include "RimSummaryCalculation.h"
 
 #include "expressionparser/ExpressionParser.h"
 
@@ -37,12 +37,12 @@
 #include <algorithm>
 
 
-CAF_PDM_SOURCE_INIT(RimCalculation, "RimCalculation");
+CAF_PDM_SOURCE_INIT(RimSummaryCalculation, "RimCalculation");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCalculation::RimCalculation()
+RimSummaryCalculation::RimSummaryCalculation()
 {
     CAF_PDM_InitObject("RimCalculation", ":/octave.png", "Calculation", "");
 
@@ -61,7 +61,7 @@ RimCalculation::RimCalculation()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCalculation::setDescription(const QString& description)
+void RimSummaryCalculation::setDescription(const QString& description)
 {
     m_description = description;
 }
@@ -69,7 +69,7 @@ void RimCalculation::setDescription(const QString& description)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QString RimCalculation::description() const
+QString RimSummaryCalculation::description() const
 {
     return m_description;
 }
@@ -77,7 +77,7 @@ QString RimCalculation::description() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmChildArrayFieldHandle* RimCalculation::variables()
+caf::PdmChildArrayFieldHandle* RimSummaryCalculation::variables()
 {
     return &m_variables;
 }
@@ -85,7 +85,7 @@ caf::PdmChildArrayFieldHandle* RimCalculation::variables()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCalculationVariable* RimCalculation::addVariable()
+RimCalculationVariable* RimSummaryCalculation::addVariable()
 {
     RimCalculationVariable* v = new RimCalculationVariable;
     m_variables.push_back(v);
@@ -96,7 +96,7 @@ RimCalculationVariable* RimCalculation::addVariable()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCalculation::deleteVariable(RimCalculationVariable* calcVariable)
+void RimSummaryCalculation::deleteVariable(RimCalculationVariable* calcVariable)
 {
     m_variables.removeChildObject(calcVariable);
 
@@ -106,7 +106,7 @@ void RimCalculation::deleteVariable(RimCalculationVariable* calcVariable)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const std::vector<double>& RimCalculation::values() const
+const std::vector<double>& RimSummaryCalculation::values() const
 {
     return m_calculatedValues();
 }
@@ -114,7 +114,7 @@ const std::vector<double>& RimCalculation::values() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const std::vector<time_t>& RimCalculation::timeSteps() const
+const std::vector<time_t>& RimSummaryCalculation::timeSteps() const
 {
     return m_timesteps();
 }
@@ -122,7 +122,7 @@ const std::vector<time_t>& RimCalculation::timeSteps() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimCalculation::userDescriptionField()
+caf::PdmFieldHandle* RimSummaryCalculation::userDescriptionField()
 {
     return &m_description;
 }
@@ -130,9 +130,9 @@ caf::PdmFieldHandle* RimCalculation::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimCalculation::parseExpression()
+bool RimSummaryCalculation::parseExpression()
 {
-    QString leftHandSideVariableName = RimCalculation::findLeftHandSide(m_expression);
+    QString leftHandSideVariableName = RimSummaryCalculation::findLeftHandSide(m_expression);
     if (leftHandSideVariableName.isEmpty())
     {
         QMessageBox::warning(nullptr, "Expression Parser", "Failed to detect left hand side of equation");
@@ -190,9 +190,9 @@ bool RimCalculation::parseExpression()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimCalculation::calculate()
+bool RimSummaryCalculation::calculate()
 {
-    QString leftHandSideVariableName = RimCalculation::findLeftHandSide(m_expression);
+    QString leftHandSideVariableName = RimSummaryCalculation::findLeftHandSide(m_expression);
 
     ExpressionParser parser;
 
@@ -281,7 +281,7 @@ bool RimCalculation::calculate()
 //--------------------------------------------------------------------------------------------------
 /// Find the last assignment using := and interpret the text before the := as LHS
 //--------------------------------------------------------------------------------------------------
-QString RimCalculation::findLeftHandSide(const QString& expresion)
+QString RimSummaryCalculation::findLeftHandSide(const QString& expresion)
 {
     int index = expresion.lastIndexOf(":=");
     if (index > 0)
@@ -302,7 +302,7 @@ QString RimCalculation::findLeftHandSide(const QString& expresion)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCalculationVariable* RimCalculation::findByName(const QString& name) const
+RimCalculationVariable* RimSummaryCalculation::findByName(const QString& name) const
 {
     for (RimCalculationVariable* v : m_variables)
     {
@@ -318,11 +318,11 @@ RimCalculationVariable* RimCalculation::findByName(const QString& name) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QString RimCalculation::buildCalculationName() const
+QString RimSummaryCalculation::buildCalculationName() const
 {
     QString name = "Default Calculation Name";
 
-    QString lhs = RimCalculation::findLeftHandSide(m_expression);
+    QString lhs = RimSummaryCalculation::findLeftHandSide(m_expression);
     if (!lhs.isEmpty())
     {
         name = lhs;
@@ -348,7 +348,7 @@ QString RimCalculation::buildCalculationName() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCalculation::updateDependentCurvesAndPlots()
+void RimSummaryCalculation::updateDependentCurvesAndPlots()
 {
     RimCalculationCollection* calcColl = nullptr;
     this->firstAncestorOrThisOfTypeAsserted(calcColl);
diff --git a/ApplicationCode/ProjectDataModel/RimCalculation.h b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
similarity index 96%
rename from ApplicationCode/ProjectDataModel/RimCalculation.h
rename to ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
index 400884b80f..33272bf303 100644
--- a/ApplicationCode/ProjectDataModel/RimCalculation.h
+++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
@@ -28,12 +28,12 @@ class RimCalculationVariable;
 ///  
 ///  
 //==================================================================================================
-class RimCalculation : public caf::PdmObject
+class RimSummaryCalculation : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 
 public:
-    RimCalculation();
+    RimSummaryCalculation();
 
     void                            setDescription(const QString& description);
     QString                         description() const;
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
index 775b498030..ad47ab8199 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
@@ -18,7 +18,7 @@
 
 #include "RimCalculatedSummaryCase.h"
 
-#include "RimCalculation.h"
+#include "RimSummaryCalculation.h"
 #include "RimCalculationCollection.h"
 
 CAF_PDM_SOURCE_INIT(RimCalculatedSummaryCase,"CalculatedSummaryCase");
@@ -111,7 +111,7 @@ RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::RifCalculatedSummaryC
 //--------------------------------------------------------------------------------------------------
 const std::vector<time_t>& RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
 {
-    RimCalculation* calc = findCalculationByName(resultAddress);
+    RimSummaryCalculation* calc = findCalculationByName(resultAddress);
     if (calc)
     {
         return calc->timeSteps();
@@ -127,7 +127,7 @@ const std::vector<time_t>& RimCalculatedSummaryCase::RifCalculatedSummaryCurveRe
 //--------------------------------------------------------------------------------------------------
 bool RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
 {
-    RimCalculation* calc = findCalculationByName(resultAddress);
+    RimSummaryCalculation* calc = findCalculationByName(resultAddress);
     if (calc)
     {
         *values = calc->values();
@@ -153,7 +153,7 @@ void RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::buildMetaData()
 {
     m_allResultAddresses.clear();
 
-    for (RimCalculation* calc : m_calculationCollection->calculations())
+    for (RimSummaryCalculation* calc : m_calculationCollection->calculations())
     {
         m_allResultAddresses.push_back(RifEclipseSummaryAddress::calculatedCurveAddress(calc->description().toStdString()));
     }
@@ -162,13 +162,13 @@ void RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::buildMetaData()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCalculation* RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const
+RimSummaryCalculation* RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const
 {
     if (m_calculationCollection && resultAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED)
     {
         QString calculatedName = QString::fromStdString(resultAddress.quantityName());
 
-        for (RimCalculation* calc : m_calculationCollection->calculations())
+        for (RimSummaryCalculation* calc : m_calculationCollection->calculations())
         {
             if (calc->description() == calculatedName)
             {
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
index 604a373b76..47273d7c15 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
@@ -22,7 +22,7 @@
 #include "RifSummaryReaderInterface.h"
 
 class RimCalculationCollection;
-class RimCalculation;
+class RimSummaryCalculation;
 
 
 //==================================================================================================
@@ -48,7 +48,7 @@ private:
         void                                buildMetaData();
 
     private:
-        RimCalculation*                     findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const;
+        RimSummaryCalculation*                     findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const;
 
     private:
         caf::PdmPointer<RimCalculationCollection> m_calculationCollection;
diff --git a/ApplicationCode/UnitTests/RicExpressionParser-Test.cpp b/ApplicationCode/UnitTests/RicExpressionParser-Test.cpp
index 19c71c76e9..4d20ef2a00 100644
--- a/ApplicationCode/UnitTests/RicExpressionParser-Test.cpp
+++ b/ApplicationCode/UnitTests/RicExpressionParser-Test.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "RimCalculation.h"
+#include "RimSummaryCalculation.h"
 
 #include "expressionparser/ExpressionParser.h"
 
@@ -55,7 +55,7 @@ TEST(RicExpressionParserTest, FindLeftHandSide)
     {
         QString expr = "c := a";
 
-        QString s = RimCalculation::findLeftHandSide(expr);
+        QString s = RimSummaryCalculation::findLeftHandSide(expr);
 
         EXPECT_STREQ(s.toStdString().data(), "c");
     }
@@ -63,7 +63,7 @@ TEST(RicExpressionParserTest, FindLeftHandSide)
     {
         QString expr = "c:=a";
 
-        QString s = RimCalculation::findLeftHandSide(expr);
+        QString s = RimSummaryCalculation::findLeftHandSide(expr);
 
         EXPECT_STREQ(s.toStdString().data(), "c");
     }
@@ -71,7 +71,7 @@ TEST(RicExpressionParserTest, FindLeftHandSide)
     {
         QString expr = "\na:=b\n\nc:=a";
 
-        QString s = RimCalculation::findLeftHandSide(expr);
+        QString s = RimSummaryCalculation::findLeftHandSide(expr);
 
         EXPECT_STREQ(s.toStdString().data(), "c");
     }
diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
index 98203c24e8..73347e62d3 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
@@ -24,7 +24,7 @@
 #include "RifEclipseSummaryAddress.h"
 #include "RifSummaryReaderInterface.h"
 
-#include "RimCalculation.h"
+#include "RimSummaryCalculation.h"
 #include "RimCalculatedSummaryCase.h"
 #include "RimCalculationCollection.h"
 #include "RimObservedData.h"