diff --git a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake
index 7caf015d51..d315899b31 100644
--- a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake
+++ b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake
@@ -7,7 +7,7 @@ endif()
 set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.h
 ${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.h
-${CEE_CURRENT_LIST_DIR}RivCrossSectionSourceInfo.h
+${CEE_CURRENT_LIST_DIR}RivIntersectionSourceInfo.h
 ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.h
 ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h
 )
@@ -15,7 +15,7 @@ ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h
 set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.cpp
 ${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.cpp
-${CEE_CURRENT_LIST_DIR}RivCrossSectionSourceInfo.cpp
+${CEE_CURRENT_LIST_DIR}RivIntersectionSourceInfo.cpp
 ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.cpp
 ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.cpp
 )
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp
index e24b82d79e..453c948c2b 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp
@@ -37,7 +37,7 @@
 #include "RimLegendConfig.h"
 #include "RimTernaryLegendConfig.h"
 
-#include "RivCrossSectionSourceInfo.h"
+#include "RivIntersectionSourceInfo.h"
 #include "RivResultToTextureMapper.h"
 #include "RivScalarMapperUtils.h"
 #include "RivTernaryScalarMapper.h"
@@ -300,7 +300,7 @@ void RivIntersectionPartMgr::generatePartGeometry()
             part->setDrawable(geo.p());
 
             // Set mapping from triangle face index to cell index
-            cvf::ref<RivCrossSectionSourceInfo> si = new RivCrossSectionSourceInfo(m_crossSectionGenerator.p());
+            cvf::ref<RivIntersectionSourceInfo> si = new RivIntersectionSourceInfo(m_crossSectionGenerator.p());
             part->setSourceInfo(si.p());
 
             part->updateBoundingBox();
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp
similarity index 88%
rename from ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.cpp
rename to ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp
index 7b7730f46d..b7f1fbe997 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp
@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RivCrossSectionSourceInfo.h"
+#include "RivIntersectionSourceInfo.h"
 
 #include "RivIntersectionGeometryGenerator.h"
 
@@ -25,7 +25,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivCrossSectionSourceInfo::RivCrossSectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator)
+RivIntersectionSourceInfo::RivIntersectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator)
     : m_crossSectionGeometryGenerator(geometryGenerator)
 {
     CVF_ASSERT(m_crossSectionGeometryGenerator.notNull());
@@ -34,7 +34,7 @@ RivCrossSectionSourceInfo::RivCrossSectionSourceInfo(RivIntersectionGeometryGene
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const std::vector<size_t>& RivCrossSectionSourceInfo::triangleToCellIndex() const
+const std::vector<size_t>& RivIntersectionSourceInfo::triangleToCellIndex() const
 {
     CVF_ASSERT(m_crossSectionGeometryGenerator.notNull());
 
@@ -44,7 +44,7 @@ const std::vector<size_t>& RivCrossSectionSourceInfo::triangleToCellIndex() cons
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const RimCrossSection* RivCrossSectionSourceInfo::crossSection() const
+const RimCrossSection* RivIntersectionSourceInfo::crossSection() const
 {
     return m_crossSectionGeometryGenerator->crossSection();
 }
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h
similarity index 90%
rename from ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.h
rename to ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h
index 5e6ee17e2e..b8d47c62eb 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h
@@ -26,10 +26,10 @@
 class RivIntersectionGeometryGenerator;
 class RimCrossSection;
 
-class RivCrossSectionSourceInfo : public cvf::Object
+class RivIntersectionSourceInfo : public cvf::Object
 {
 public:
-    RivCrossSectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator);
+    RivIntersectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator);
 
     const std::vector<size_t>& triangleToCellIndex() const;
 
diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
index 31e54cd8ee..6f7ceb8466 100644
--- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
@@ -54,7 +54,7 @@
 #include "RiuSelectionManager.h"
 #include "RiuViewer.h"
 
-#include "RivCrossSectionSourceInfo.h"
+#include "RivIntersectionSourceInfo.h"
 #include "RivFemPartGeometryGenerator.h"
 #include "RivFemPickSourceInfo.h"
 #include "RivSourceInfo.h"
@@ -152,7 +152,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
     {
         const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>(firstHitPart->sourceInfo());
         const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>(firstHitPart->sourceInfo());
-        const RivCrossSectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivCrossSectionSourceInfo*>(firstHitPart->sourceInfo());
+        const RivIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivIntersectionSourceInfo*>(firstHitPart->sourceInfo());
 
         if (rivSourceInfo || femSourceInfo || crossSectionSourceInfo)
         {
@@ -464,7 +464,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
         {
             const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>(firstHitPart->sourceInfo());
             const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>(firstHitPart->sourceInfo());
-            const RivCrossSectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivCrossSectionSourceInfo*>(firstHitPart->sourceInfo());
+            const RivIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivIntersectionSourceInfo*>(firstHitPart->sourceInfo());
 
             if (rivSourceInfo)
             {
@@ -548,7 +548,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuViewerCommands::findCellAndGridIndex(const RivCrossSectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex)
+void RiuViewerCommands::findCellAndGridIndex(const RivIntersectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex)
 {
     CVF_ASSERT(cellIndex && gridIndex);
 
diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.h b/ApplicationCode/UserInterface/RiuViewerCommands.h
index f087dc40a6..c406b20616 100644
--- a/ApplicationCode/UserInterface/RiuViewerCommands.h
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.h
@@ -30,7 +30,7 @@ class RimEclipseView;
 class RimGeoMechView;
 class RimView;
 class RiuViewer;
-class RivCrossSectionSourceInfo;
+class RivIntersectionSourceInfo;
 class RicViewerEventInterface;
 
 class QMouseEvent;
@@ -53,7 +53,7 @@ public:
     void            displayContextMenu(QMouseEvent* event);
     void            handlePickAction(int winPosX, int winPosY, Qt::KeyboardModifiers keyboardModifiers);
 
-    void            findCellAndGridIndex(const RivCrossSectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex);
+    void            findCellAndGridIndex(const RivIntersectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex);
 
 private slots:
     void            slotRangeFilterI();