diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp
index 9c9ce3bd6b..84ab935862 100644
--- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp
+++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp
@@ -33,7 +33,7 @@
 #include "RiuViewer.h"
 #include "RivFemPickSourceInfo.h"
 #include "RivGeoMechVizLogic.h"
-#include "RivIntersectionBoxSourceInfo.h"
+#include "RivBoxIntersectionSourceInfo.h"
 #include "RivExtrudedCurveIntersectionSourceInfo.h"
 #include "RivMeshLinesSourceInfo.h"
 #include "RivSimWellPipeSourceInfo.h"
@@ -359,7 +359,7 @@ bool RicHoloLensExportImpl::isGrid( const cvf::Part* part )
         }
 
         {
-            auto sourceInfoOfType = dynamic_cast<const RivIntersectionBoxSourceInfo*>( sourceInfo );
+            auto sourceInfoOfType = dynamic_cast<const RivBoxIntersectionSourceInfo*>( sourceInfo );
             if ( sourceInfoOfType )
             {
                 return true;
diff --git a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake
index ec4c52872f..d897137b40 100644
--- a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake
+++ b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake
@@ -5,9 +5,9 @@ ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionPartMgr.h
 ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionSourceInfo.h
 ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.h
 ${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.h
-${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.h
+${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionGeometryGenerator.h
 ${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionPartMgr.h
-${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxSourceInfo.h
+${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionSourceInfo.h
 ${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattner.h
 )
 
@@ -17,9 +17,9 @@ ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionPartMgr.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionSourceInfo.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.cpp
-${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.cpp
+${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionGeometryGenerator.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionPartMgr.cpp
-${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxSourceInfo.cpp
+${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionSourceInfo.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattner.cpp
 )
 
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.cpp
similarity index 97%
rename from ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.cpp
rename to ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.cpp
index 96ea0ed770..c384d67eef 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.cpp
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RivIntersectionBoxGeometryGenerator.h"
+#include "RivBoxIntersectionGeometryGenerator.h"
 
 #include "RimCase.h"
 #include "RimGridView.h"
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionBoxGeometryGenerator::RivIntersectionBoxGeometryGenerator( RimBoxIntersection* intersectionBox,
+RivBoxIntersectionGeometryGenerator::RivBoxIntersectionGeometryGenerator( RimBoxIntersection* intersectionBox,
                                                                           const RivIntersectionHexGridInterface* grid )
     : m_intersectionBoxDefinition( intersectionBox )
     , m_hexGrid( grid )
@@ -46,12 +46,12 @@ RivIntersectionBoxGeometryGenerator::RivIntersectionBoxGeometryGenerator( RimBox
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionBoxGeometryGenerator::~RivIntersectionBoxGeometryGenerator() {}
+RivBoxIntersectionGeometryGenerator::~RivBoxIntersectionGeometryGenerator() {}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RivIntersectionBoxGeometryGenerator::isAnyGeometryPresent() const
+bool RivBoxIntersectionGeometryGenerator::isAnyGeometryPresent() const
 {
     if ( m_triangleVxes->size() == 0 )
     {
@@ -66,7 +66,7 @@ bool RivIntersectionBoxGeometryGenerator::isAnyGeometryPresent() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo> RivIntersectionBoxGeometryGenerator::generateSurface()
+cvf::ref<cvf::DrawableGeo> RivBoxIntersectionGeometryGenerator::generateSurface()
 {
     calculateArrays();
 
@@ -83,7 +83,7 @@ cvf::ref<cvf::DrawableGeo> RivIntersectionBoxGeometryGenerator::generateSurface(
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo> RivIntersectionBoxGeometryGenerator::createMeshDrawable()
+cvf::ref<cvf::DrawableGeo> RivBoxIntersectionGeometryGenerator::createMeshDrawable()
 {
     if ( !( m_cellBorderLineVxes.notNull() && m_cellBorderLineVxes->size() != 0 ) ) return nullptr;
 
@@ -100,7 +100,7 @@ cvf::ref<cvf::DrawableGeo> RivIntersectionBoxGeometryGenerator::createMeshDrawab
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-const std::vector<size_t>& RivIntersectionBoxGeometryGenerator::triangleToCellIndex() const
+const std::vector<size_t>& RivBoxIntersectionGeometryGenerator::triangleToCellIndex() const
 {
     CVF_ASSERT( m_triangleVxes->size() );
     return m_triangleToCellIdxMap;
@@ -110,7 +110,7 @@ const std::vector<size_t>& RivIntersectionBoxGeometryGenerator::triangleToCellIn
 ///
 //--------------------------------------------------------------------------------------------------
 const std::vector<RivIntersectionVertexWeights>&
-    RivIntersectionBoxGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const
+    RivBoxIntersectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const
 {
     CVF_ASSERT( m_triangleVxes->size() );
     return m_triVxToCellCornerWeights;
@@ -119,7 +119,7 @@ const std::vector<RivIntersectionVertexWeights>&
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-const cvf::Vec3fArray* RivIntersectionBoxGeometryGenerator::triangleVxes() const
+const cvf::Vec3fArray* RivBoxIntersectionGeometryGenerator::triangleVxes() const
 {
     CVF_ASSERT( m_triangleVxes->size() );
 
@@ -236,7 +236,7 @@ private:
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimBoxIntersection* RivIntersectionBoxGeometryGenerator::intersectionBox() const
+RimBoxIntersection* RivBoxIntersectionGeometryGenerator::intersectionBox() const
 {
     return m_intersectionBoxDefinition;
 }
@@ -244,7 +244,7 @@ RimBoxIntersection* RivIntersectionBoxGeometryGenerator::intersectionBox() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionBoxGeometryGenerator::calculateArrays()
+void RivBoxIntersectionGeometryGenerator::calculateArrays()
 {
     if ( m_triangleVxes->size() ) return;
 
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.h
similarity index 92%
rename from ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h
rename to ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.h
index c2aecdb08a..73b09fd8ab 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.h
@@ -37,13 +37,13 @@ class ScalarMapper;
 class DrawableGeo;
 } // namespace cvf
 
-class RivIntersectionBoxGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
+class RivBoxIntersectionGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
 {
 public:
-    RivIntersectionBoxGeometryGenerator( RimBoxIntersection*                    intersectionBox,
+    RivBoxIntersectionGeometryGenerator( RimBoxIntersection*                    intersectionBox,
                                          const RivIntersectionHexGridInterface* grid );
 
-    ~RivIntersectionBoxGeometryGenerator() override;
+    ~RivBoxIntersectionGeometryGenerator() override;
 
     // Generate geometry
     cvf::ref<cvf::DrawableGeo> generateSurface();
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp
index 6ea0319e71..995d3457c2 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp
@@ -36,7 +36,7 @@
 #include "RimRegularLegendConfig.h"
 #include "RimTernaryLegendConfig.h"
 
-#include "RivIntersectionBoxSourceInfo.h"
+#include "RivBoxIntersectionSourceInfo.h"
 #include "RivExtrudedCurveIntersectionPartMgr.h"
 #include "RivIntersectionResultsColoringTools.h"
 #include "RivMeshLinesSourceInfo.h"
@@ -67,7 +67,7 @@ RivBoxIntersectionPartMgr::RivBoxIntersectionPartMgr( RimBoxIntersection* inters
     m_intersectionBoxFacesTextureCoords = new cvf::Vec2fArray;
 
     cvf::ref<RivIntersectionHexGridInterface> hexGrid = intersectionBox->createHexGridInterface();
-    m_intersectionBoxGenerator = new RivIntersectionBoxGeometryGenerator( m_rimIntersectionBox, hexGrid.p() );
+    m_intersectionBoxGenerator = new RivBoxIntersectionGeometryGenerator( m_rimIntersectionBox, hexGrid.p() );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -117,7 +117,7 @@ void RivBoxIntersectionPartMgr::generatePartGeometry()
             part->setDrawable( geo.p() );
 
             // Set mapping from triangle face index to cell index
-            cvf::ref<RivIntersectionBoxSourceInfo> si = new RivIntersectionBoxSourceInfo( m_intersectionBoxGenerator.p() );
+            cvf::ref<RivBoxIntersectionSourceInfo> si = new RivBoxIntersectionSourceInfo( m_intersectionBoxGenerator.p() );
             part->setSourceInfo( si.p() );
 
             part->updateBoundingBox();
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.h b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.h
index 4dbbef409e..1d740e8f57 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "RivIntersectionBoxGeometryGenerator.h"
+#include "RivBoxIntersectionGeometryGenerator.h"
 
 #include "cvfObject.h"
 
@@ -73,5 +73,5 @@ private:
     cvf::ref<cvf::Part>       m_intersectionBoxGridLines;
     cvf::ref<cvf::Vec2fArray> m_intersectionBoxFacesTextureCoords;
 
-    cvf::ref<RivIntersectionBoxGeometryGenerator> m_intersectionBoxGenerator;
+    cvf::ref<RivBoxIntersectionGeometryGenerator> m_intersectionBoxGenerator;
 };
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.cpp b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionSourceInfo.cpp
similarity index 85%
rename from ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.cpp
rename to ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionSourceInfo.cpp
index f83f14734a..da4cd576ee 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionSourceInfo.cpp
@@ -16,14 +16,14 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RivIntersectionBoxSourceInfo.h"
+#include "RivBoxIntersectionSourceInfo.h"
 
-#include "RivIntersectionBoxGeometryGenerator.h"
+#include "RivBoxIntersectionGeometryGenerator.h"
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionBoxSourceInfo::RivIntersectionBoxSourceInfo( RivIntersectionBoxGeometryGenerator* geometryGenerator )
+RivBoxIntersectionSourceInfo::RivBoxIntersectionSourceInfo( RivBoxIntersectionGeometryGenerator* geometryGenerator )
     : m_intersectionBoxGeometryGenerator( geometryGenerator )
 {
     CVF_ASSERT( m_intersectionBoxGeometryGenerator.notNull() );
@@ -32,7 +32,7 @@ RivIntersectionBoxSourceInfo::RivIntersectionBoxSourceInfo( RivIntersectionBoxGe
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-const std::vector<size_t>& RivIntersectionBoxSourceInfo::triangleToCellIndex() const
+const std::vector<size_t>& RivBoxIntersectionSourceInfo::triangleToCellIndex() const
 {
     CVF_ASSERT( m_intersectionBoxGeometryGenerator.notNull() );
 
@@ -42,7 +42,7 @@ const std::vector<size_t>& RivIntersectionBoxSourceInfo::triangleToCellIndex() c
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::array<cvf::Vec3f, 3> RivIntersectionBoxSourceInfo::triangle( int triangleIdx ) const
+std::array<cvf::Vec3f, 3> RivBoxIntersectionSourceInfo::triangle( int triangleIdx ) const
 {
     std::array<cvf::Vec3f, 3> tri;
     tri[0] = ( *m_intersectionBoxGeometryGenerator->triangleVxes() )[triangleIdx * 3];
@@ -55,7 +55,7 @@ std::array<cvf::Vec3f, 3> RivIntersectionBoxSourceInfo::triangle( int triangleId
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimBoxIntersection* RivIntersectionBoxSourceInfo::intersectionBox() const
+RimBoxIntersection* RivBoxIntersectionSourceInfo::intersectionBox() const
 {
     return m_intersectionBoxGeometryGenerator->intersectionBox();
 }
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionSourceInfo.h
similarity index 83%
rename from ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h
rename to ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionSourceInfo.h
index fee82f591e..8941a75d1b 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionSourceInfo.h
@@ -22,13 +22,13 @@
 #include "cvfObject.h"
 #include <array>
 
-class RivIntersectionBoxGeometryGenerator;
+class RivBoxIntersectionGeometryGenerator;
 class RimBoxIntersection;
 
-class RivIntersectionBoxSourceInfo : public cvf::Object
+class RivBoxIntersectionSourceInfo : public cvf::Object
 {
 public:
-    explicit RivIntersectionBoxSourceInfo( RivIntersectionBoxGeometryGenerator* geometryGenerator );
+    explicit RivBoxIntersectionSourceInfo( RivBoxIntersectionGeometryGenerator* geometryGenerator );
 
     const std::vector<size_t>& triangleToCellIndex() const;
 
@@ -36,5 +36,5 @@ public:
     RimBoxIntersection*       intersectionBox() const;
 
 private:
-    cvf::cref<RivIntersectionBoxGeometryGenerator> m_intersectionBoxGeometryGenerator;
+    cvf::cref<RivBoxIntersectionGeometryGenerator> m_intersectionBoxGeometryGenerator;
 };
diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
index 443fa3a469..d3149ea799 100644
--- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
@@ -77,7 +77,7 @@
 
 #include "RivFemPartGeometryGenerator.h"
 #include "RivFemPickSourceInfo.h"
-#include "RivIntersectionBoxSourceInfo.h"
+#include "RivBoxIntersectionSourceInfo.h"
 #include "RivExtrudedCurveIntersectionSourceInfo.h"
 #include "RivObjectSourceInfo.h"
 #include "RivPartPriority.h"
@@ -272,7 +272,7 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event )
             firstHitPart->sourceInfo() );
         const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>(
             firstHitPart->sourceInfo() );
-        const RivIntersectionBoxSourceInfo* intersectionBoxSourceInfo = dynamic_cast<const RivIntersectionBoxSourceInfo*>(
+        const RivBoxIntersectionSourceInfo* intersectionBoxSourceInfo = dynamic_cast<const RivBoxIntersectionSourceInfo*>(
             firstHitPart->sourceInfo() );
 
         if ( rivSourceInfo || femSourceInfo || crossSectionSourceInfo || intersectionBoxSourceInfo )
@@ -725,8 +725,8 @@ void RiuViewerCommands::handlePickAction( int winPosX, int winPosY, Qt::Keyboard
                 firstHitPart->sourceInfo() );
             const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>(
                 firstHitPart->sourceInfo() );
-            const RivIntersectionBoxSourceInfo* intersectionBoxSourceInfo =
-                dynamic_cast<const RivIntersectionBoxSourceInfo*>( firstHitPart->sourceInfo() );
+            const RivBoxIntersectionSourceInfo* intersectionBoxSourceInfo =
+                dynamic_cast<const RivBoxIntersectionSourceInfo*>( firstHitPart->sourceInfo() );
             const RivSimWellPipeSourceInfo* eclipseWellSourceInfo = dynamic_cast<const RivSimWellPipeSourceInfo*>(
                 firstHitPart->sourceInfo() );
             const RivWellConnectionSourceInfo* wellConnectionSourceInfo = dynamic_cast<const RivWellConnectionSourceInfo*>(
@@ -1177,7 +1177,7 @@ void RiuViewerCommands::findCellAndGridIndex( Rim3dView*                       m
 ///
 //--------------------------------------------------------------------------------------------------
 void RiuViewerCommands::findCellAndGridIndex( Rim3dView*                          mainOrComparisonView,
-                                              const RivIntersectionBoxSourceInfo* intersectionBoxSourceInfo,
+                                              const RivBoxIntersectionSourceInfo* intersectionBoxSourceInfo,
                                               cvf::uint                           firstPartTriangleIndex,
                                               size_t*                             cellIndex,
                                               size_t*                             gridIndex )
diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.h b/ApplicationCode/UserInterface/RiuViewerCommands.h
index db5b440fc2..54a90c8fc4 100644
--- a/ApplicationCode/UserInterface/RiuViewerCommands.h
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.h
@@ -32,7 +32,7 @@ class RimGeoMechView;
 class RimExtrudedCurveIntersection;
 class Rim3dView;
 class RiuViewer;
-class RivIntersectionBoxSourceInfo;
+class RivBoxIntersectionSourceInfo;
 class RivExtrudedCurveIntersectionSourceInfo;
 class RiuPickItemInfo;
 
@@ -76,7 +76,7 @@ private:
                                size_t*                          cellIndex,
                                size_t*                          gridIndex );
     void findCellAndGridIndex( Rim3dView*                          mainOrComparisonView,
-                               const RivIntersectionBoxSourceInfo* intersectionBoxSourceInfo,
+                               const RivBoxIntersectionSourceInfo* intersectionBoxSourceInfo,
                                cvf::uint                           firstPartTriangleIndex,
                                size_t*                             cellIndex,
                                size_t*                             gridIndex );