diff --git a/ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp b/ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
index ad26c2e525..60c51470e9 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
@@ -87,14 +87,14 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(RimEclipse
                     completionTypeCellResult[intersection] = RiaDefines::WELL_PATH;
                 }
 
-                auto conn = eclipseCase->computeAndGetVirtualPerforationTransmissibilities();
-                if (conn)
+                auto completions = eclipseCase->computeAndGetVirtualPerforationTransmissibilities();
+                if (completions)
                 {
-                    for (const auto& connForWell : conn->multipleCompletionsPerEclipseCell(wellPath, timeStep))
+                    for (const auto& completionsForWell : completions->multipleCompletionsPerEclipseCell(wellPath, timeStep))
                     {
                         RiaDefines::CompletionType appCompletionType = RiaDefines::WELL_PATH;
 
-                        auto appCompletionTypes = fromCompletionData(connForWell.second);
+                        auto appCompletionTypes = fromCompletionData(completionsForWell.second);
 
                         if (std::find(appCompletionTypes.begin(), appCompletionTypes.end(), RiaDefines::FISHBONES) !=
                             appCompletionTypes.end())
@@ -113,7 +113,7 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(RimEclipse
                             appCompletionType = RiaDefines::PERFORATION_INTERVAL;
                         }
 
-                        completionTypeCellResult[connForWell.first.globalCellIndex()] = appCompletionType;
+                        completionTypeCellResult[completionsForWell.first.globalCellIndex()] = appCompletionType;
                     }
                 }
             }
diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp
index 2f15706166..12a4fafd3d 100644
--- a/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp
+++ b/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp
@@ -69,7 +69,7 @@ RigVirtualPerforationTransmissibilities::~RigVirtualPerforationTransmissibilitie
 //--------------------------------------------------------------------------------------------------
 void RigVirtualPerforationTransmissibilities::setCompletionDataForWellPath(
     const RimWellPath*                                 wellPath,
-    std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep)
+    const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep)
 {
     auto item = m_mapFromWellToCompletionData.find(wellPath);
 
@@ -95,7 +95,8 @@ void RigVirtualPerforationTransmissibilities::setCompletionDataForWellPath(
 ///
 //--------------------------------------------------------------------------------------------------
 const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
-    RigVirtualPerforationTransmissibilities::multipleCompletionsPerEclipseCell(const RimWellPath* wellPath, size_t timeStepIndex) const
+    RigVirtualPerforationTransmissibilities::multipleCompletionsPerEclipseCell(const RimWellPath* wellPath,
+                                                                               size_t             timeStepIndex) const
 {
     static std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>> dummy;
 
@@ -118,8 +119,8 @@ const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
 ///
 //--------------------------------------------------------------------------------------------------
 void RigVirtualPerforationTransmissibilities::setCompletionDataForSimWell(
-    const RigSimWellData*                        simWellData,
-    std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep)
+    const RigSimWellData*                              simWellData,
+    const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep)
 {
     m_mapFromSimWellToCompletionData[simWellData] = completionsPerTimeStep;
 }
diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h b/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h
index 1ebac53592..411d2a28be 100644
--- a/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h
+++ b/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h
@@ -56,12 +56,12 @@ public:
     RigVirtualPerforationTransmissibilities();
     ~RigVirtualPerforationTransmissibilities();
 
-    void setCompletionDataForWellPath(const RimWellPath* wellPath, std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep);
+    void setCompletionDataForWellPath(const RimWellPath* wellPath, const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep);
 
     const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
         multipleCompletionsPerEclipseCell(const RimWellPath* wellPath, size_t timeStepIndex) const;
 
-    void setCompletionDataForSimWell(const RigSimWellData* simWellData, std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep);
+    void setCompletionDataForSimWell(const RigSimWellData* simWellData, const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep);
     
     const std::vector<RigCompletionData>&
         completionsForSimWell(const RigSimWellData* simWellData, size_t timeStepIndex) const;