diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 4ad62bfd56..af82620b22 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -79,7 +79,7 @@
 #include "RiuMainWindow.h"
 #include "RiuProcessMonitor.h"
 #include "RiuRecentFileActionProvider.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 #include "RiuViewer.h"
 
 #include "cafAppEnum.h"
@@ -1598,8 +1598,8 @@ bool RiaApplication::enableDevelopmentFeatures()
 //--------------------------------------------------------------------------------------------------
 void RiaApplication::clearAllSelections()
 {
-    RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_APPLICATION_GLOBAL);
-    RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager::instance()->deleteAllItems(Riu3dSelectionManager::RUI_APPLICATION_GLOBAL);
+    Riu3dSelectionManager::instance()->deleteAllItems(Riu3dSelectionManager::RUI_TEMPORARY);
     caf::SelectionManager::instance()->clearAll();
 }
 
diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp
index 218993877b..95135fa034 100644
--- a/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp
@@ -27,7 +27,7 @@
 #include "RimWellPath.h"
 
 #include "Riu3DMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "cafSelectionManager.h"
 
@@ -70,8 +70,8 @@ void RicNewFishbonesSubsAtMeasuredDepthFeature::onActionTriggered(bool isChecked
 //--------------------------------------------------------------------------------------------------
 RiuWellPathSelectionItem* RicNewFishbonesSubsAtMeasuredDepthFeature::wellPathSelectionItem()
 {
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuWellPathSelectionItem* wellPathItem = dynamic_cast<RiuWellPathSelectionItem*>(selItem);
 
diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalAtMeasuredDepthFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalAtMeasuredDepthFeature.cpp
index eb61d16f4b..bb163d4227 100644
--- a/ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalAtMeasuredDepthFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalAtMeasuredDepthFeature.cpp
@@ -28,7 +28,7 @@
 #include "RimWellPathCollection.h"
 
 #include "Riu3DMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "cafSelectionManager.h"
 
@@ -70,8 +70,8 @@ void RicNewPerforationIntervalAtMeasuredDepthFeature::onActionTriggered(bool isC
 //--------------------------------------------------------------------------------------------------
 RiuWellPathSelectionItem* RicNewPerforationIntervalAtMeasuredDepthFeature::wellPathSelectionItem()
 {
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuWellPathSelectionItem* wellPathItem = dynamic_cast<RiuWellPathSelectionItem*>(selItem);
 
diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
index 946c26fdae..4e8013eb6e 100644
--- a/ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
+++ b/ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
@@ -26,7 +26,7 @@
 #include "RimGridView.h"
 
 #include "Riu3DMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 #include "RiuViewer.h"
 
 #include "cafCmdExecCommandManager.h"
@@ -124,7 +124,7 @@ void RicNewAzimuthDipIntersectionFeatureCmd::redo()
     
     m_intersectionCollection->appendIntersectionAndUpdate(intersection);
 
-    RiuSelectionManager::instance()->deleteAllItems();
+    Riu3dSelectionManager::instance()->deleteAllItems();
     Riu3DMainWindowTools::selectAsCurrentItem(intersection);
 }
 
diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
index 35c6ebfa72..1a61e94d53 100644
--- a/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
+++ b/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
@@ -27,7 +27,7 @@
 #include "RimGridView.h"
 
 #include "Riu3DMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 #include "RiuViewer.h"
 
 #include "cafCmdExecCommandManager.h"
@@ -114,7 +114,7 @@ void RicNewPolylineIntersectionFeatureCmd::redo()
 
     m_intersectionCollection->appendIntersectionAndUpdate(intersection);
 
-    RiuSelectionManager::instance()->deleteAllItems();
+    Riu3dSelectionManager::instance()->deleteAllItems();
 
     Riu3DMainWindowTools::selectAsCurrentItem(intersection);
 }
diff --git a/ApplicationCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp b/ApplicationCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp
index e02543f14c..f5b89e9b9f 100644
--- a/ApplicationCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp
+++ b/ApplicationCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp
@@ -35,7 +35,7 @@
 #include "RimStimPlanColors.h"
 
 #include "Riu3DMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 #include "RivSimWellPipeSourceInfo.h"
  
 #include "cafSelectionManager.h"
@@ -57,8 +57,8 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
     Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
     if (!activeView) return;
 
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuSimWellSelectionItem* simWellItem = static_cast<RiuSimWellSelectionItem*>(selItem);
     if (!simWellItem) return;
diff --git a/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureAtPosFeature.cpp b/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureAtPosFeature.cpp
index 3b2368b175..dbc1e00b81 100644
--- a/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureAtPosFeature.cpp
+++ b/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureAtPosFeature.cpp
@@ -24,7 +24,7 @@
 
 #include "RimProject.h"
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include <QAction>
 
@@ -40,8 +40,8 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
     RimProject* proj = RiaApplication::instance()->project();
     if (proj->allFractureTemplates().empty()) return;
 
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuWellPathSelectionItem* wellPathItem = dynamic_cast<RiuWellPathSelectionItem*>(selItem);
     if (!wellPathItem) return;
diff --git a/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp b/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp
index 42d8e45ab0..305cdcad08 100644
--- a/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp
+++ b/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp
@@ -23,7 +23,7 @@
 #include "RimIntersection.h"
 
 #include "Riu3DMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "cafSelectionManagerTools.h"
 
@@ -102,8 +102,8 @@ std::set<RimIntersection*> RicNewIntersectionViewFeature::selectedIntersections(
 {
     std::set<RimIntersection*> objects;
 
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem*    selItem       = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem*    selItem       = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
     if (generalSelectionItem)
diff --git a/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp b/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp
index 080d6c3c69..16fa9d2aa0 100644
--- a/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp
+++ b/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp
@@ -51,7 +51,7 @@
 #include "RimWellPathCompletions.h"
 
 #include "RiuPlotMainWindow.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include <QAction>
 #include <QDir>
diff --git a/ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp b/ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp
index 266c8376e6..a54cefbefa 100644
--- a/ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp
+++ b/ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp
@@ -23,7 +23,7 @@
 #include "RimIntersectionBox.h"
 #include "Rim3dView.h"
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include <QAction>
 
@@ -37,8 +37,8 @@ bool RicHideIntersectionBoxFeature::isCommandEnabled()
     Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
     if (!activeView) return false;
 
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
     if (!generalSelectionItem) return false;
@@ -59,8 +59,8 @@ void RicHideIntersectionBoxFeature::onActionTriggered(bool isChecked)
     Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
     if (!activeView) return;
 
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
     if (!generalSelectionItem) return;
diff --git a/ApplicationCode/Commands/RicHideIntersectionFeature.cpp b/ApplicationCode/Commands/RicHideIntersectionFeature.cpp
index 845432a9f9..2e0344f75c 100644
--- a/ApplicationCode/Commands/RicHideIntersectionFeature.cpp
+++ b/ApplicationCode/Commands/RicHideIntersectionFeature.cpp
@@ -23,7 +23,7 @@
 #include "RimIntersection.h"
 #include "Rim3dView.h"
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include <QAction>
 
@@ -37,8 +37,8 @@ bool RicHideIntersectionFeature::isCommandEnabled()
     Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
     if (!activeView) return false;
 
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
     if (!generalSelectionItem) return false;
@@ -59,8 +59,8 @@ void RicHideIntersectionFeature::onActionTriggered(bool isChecked)
     Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
     if (!activeView) return;
 
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
     if (!generalSelectionItem) return;
diff --git a/ApplicationCode/Commands/RicReloadCaseFeature.cpp b/ApplicationCode/Commands/RicReloadCaseFeature.cpp
index 1c9ae9328c..e7ae06f612 100644
--- a/ApplicationCode/Commands/RicReloadCaseFeature.cpp
+++ b/ApplicationCode/Commands/RicReloadCaseFeature.cpp
@@ -23,7 +23,7 @@
 
 #include "RimEclipseCase.h"
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "cafPdmObject.h"
 #include "cafSelectionManager.h"
diff --git a/ApplicationCode/Commands/RicWellLogTools.cpp b/ApplicationCode/Commands/RicWellLogTools.cpp
index 242af85174..007303aa6d 100644
--- a/ApplicationCode/Commands/RicWellLogTools.cpp
+++ b/ApplicationCode/Commands/RicWellLogTools.cpp
@@ -36,7 +36,7 @@
 #include "RifReaderEclipseRft.h"
 
 #include "RiuPlotMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
 
@@ -47,7 +47,7 @@
 //--------------------------------------------------------------------------------------------------
 RimSimWellInView* RicWellLogTools::selectedSimulationWell(int *branchIndex)
 {
-    RiuSelectionItem* selItem = RiuSelectionManager::instance()->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    RiuSelectionItem* selItem = Riu3dSelectionManager::instance()->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
     RiuSimWellSelectionItem* simWellSelItem = dynamic_cast<RiuSimWellSelectionItem*>(selItem);
     if (simWellSelItem)
     {
@@ -93,8 +93,8 @@ bool RicWellLogTools::wellHasRftData(const QString& wellName)
 //--------------------------------------------------------------------------------------------------
 bool RicWellLogTools::isWellPathOrSimWellSelectedInView()
 {
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
-    RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
+    RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
 
     RiuSimWellSelectionItem* simWellSelectionItem = dynamic_cast<RiuSimWellSelectionItem*>(selItem);
     if (simWellSelectionItem) return true;
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
index 32ea6a52a3..a1344ddc44 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
@@ -37,7 +37,7 @@
 #include "RimSummaryPlotCollection.h"
 
 #include "RiuPlotMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "cafPdmReferenceHelper.h"
 #include "cafPdmUiPropertyViewDialog.h"
@@ -206,7 +206,7 @@ bool RicNewGridTimeHistoryCurveFeature::isCommandEnabled()
     if (RicWellLogTools::isWellPathOrSimWellSelectedInView()) return false;
 
     std::vector<RiuSelectionItem*> items;
-    RiuSelectionManager::instance()->selectedItems(items);
+    Riu3dSelectionManager::instance()->selectedItems(items);
 
     if (items.size() > 0)
     {
@@ -234,7 +234,7 @@ void RicNewGridTimeHistoryCurveFeature::onActionTriggered(bool isChecked)
     if (!summaryPlot) return;
 
     std::vector<RiuSelectionItem*> items;
-    RiuSelectionManager::instance()->selectedItems(items);
+    Riu3dSelectionManager::instance()->selectedItems(items);
     CVF_ASSERT(items.size() > 0);
 
     for (auto item : items)
diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
index 31f57f0475..0aee07182e 100644
--- a/ApplicationCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
@@ -39,7 +39,7 @@
 #include "RimEclipseResultCase.h"
 
 #include "RiuPlotMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "cafSelectionManagerTools.h"
 
@@ -152,7 +152,7 @@ RimWellPath* RicNewPltPlotFeature::selectedWellPath() const
 //--------------------------------------------------------------------------------------------------
 RimSimWellInView* RicNewPltPlotFeature::selectedSimulationWell(int * branchIndex) const
 {
-    RiuSelectionItem* selItem = RiuSelectionManager::instance()->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
+    RiuSelectionItem* selItem = Riu3dSelectionManager::instance()->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
     RiuSimWellSelectionItem* simWellSelItem = dynamic_cast<RiuSimWellSelectionItem*>(selItem);
     if (simWellSelItem)
     {
diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
index e4700459ed..ac23136346 100644
--- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
@@ -38,7 +38,7 @@
 #include "RimWellPathCollection.h"
 
 #include "RiuPlotMainWindow.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "cafSelectionManager.h"
 
diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp
index 39bfb88364..306bcfed6c 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp
@@ -22,7 +22,7 @@
 #include "RimGeoMechView.h"
 
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 
 CAF_PDM_SOURCE_INIT(RimGeoMechGeometrySelectionItem, "GeoMechGeometrySelectionItem");
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp b/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp
index 5d5701a1eb..130fb786b1 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp
@@ -23,7 +23,7 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 
 CAF_PDM_SOURCE_INIT(RimEclipseGeometrySelectionItem, "EclipseGeometrySelectionItem");
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
index 05f38028ea..e196d1d702 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@@ -67,7 +67,7 @@
 #include "RimWellPathCollection.h"
 
 #include "RiuMainWindow.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 #include "RiuViewer.h"
 
 #include "RivReservoirSimWellsPartMgr.h"
@@ -1804,7 +1804,7 @@ bool RimEclipseView::showActiveCellsOnly()
 //--------------------------------------------------------------------------------------------------
 void RimEclipseView::createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts)
 {
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
     std::vector<RiuSelectionItem*> items;
     riuSelManager->selectedItems(items);
 
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
index 7307e3d7c4..82dc1919ba 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
@@ -42,7 +42,7 @@
 #include "RimViewLinker.h"
 
 #include "Riu3DMainWindowTools.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 #include "RiuViewer.h"
 
 #include "RivGeoMechPartMgr.h"
@@ -769,7 +769,7 @@ void RimGeoMechView::calculateCurrentTotalCellVisibility(cvf::UByteArray* totalV
 //--------------------------------------------------------------------------------------------------
 void RimGeoMechView::createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts)
 {
-    RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
+    Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
     std::vector<RiuSelectionItem*> items;
     riuSelManager->selectedItems(items);
     for (size_t i = 0; i < items.size(); i++)
diff --git a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
index c78a2f7422..c79d2c1b7e 100644
--- a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
@@ -41,7 +41,7 @@
 
 #include "RiuFemTimeHistoryResultAccessor.h"
 #include "RiuQwtPlotCurve.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "qwt_plot.h"
 
diff --git a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
index 24ab4caf6b..efecd60ed8 100644
--- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
@@ -46,7 +46,7 @@
 #include "RimReservoirCellResultsStorage.h"
 #include "RimSimWellInViewCollection.h"
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include <QTcpSocket>
 
@@ -599,7 +599,7 @@ public:
                                  std::vector<qint32>& cellK)
     {
         std::vector<RiuSelectionItem*> items;
-        RiuSelectionManager::instance()->selectedItems(items);
+        Riu3dSelectionManager::instance()->selectedItems(items);
 
         for (const RiuSelectionItem* item : items)
         {
diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
index 7dae447c82..10e2f4961a 100644
--- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
@@ -45,7 +45,7 @@
 
 #include "RiuMainWindow.h"
 #include "RiuProcessMonitor.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include <QErrorMessage>
 
@@ -1296,7 +1296,7 @@ public:
     static std::vector< std::pair<size_t, size_t> > getSelectedCellsForCase(const RimCase* reservoirCase)
     {
         std::vector<RiuSelectionItem*> items;
-        RiuSelectionManager::instance()->selectedItems(items);
+        Riu3dSelectionManager::instance()->selectedItems(items);
 
         std::vector< std::pair<size_t, size_t> > selectedCells;
 
diff --git a/ApplicationCode/UserInterface/CMakeLists_files.cmake b/ApplicationCode/UserInterface/CMakeLists_files.cmake
index 8999464694..4ba11b74e7 100644
--- a/ApplicationCode/UserInterface/CMakeLists_files.cmake
+++ b/ApplicationCode/UserInterface/CMakeLists_files.cmake
@@ -34,7 +34,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuResultQwtPlot.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuResultTextBuilder.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuRmsNavigation.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuSelectionChangedHandler.h
-${CMAKE_CURRENT_LIST_DIR}/RiuSelectionManager.h
+${CMAKE_CURRENT_LIST_DIR}/Riu3dSelectionManager.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuSimpleHistogramWidget.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQwtPlot.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuTextDialog.h
@@ -112,7 +112,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuResultQwtPlot.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuResultTextBuilder.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuRmsNavigation.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuSelectionChangedHandler.cpp
-${CMAKE_CURRENT_LIST_DIR}/RiuSelectionManager.cpp
+${CMAKE_CURRENT_LIST_DIR}/Riu3dSelectionManager.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuSimpleHistogramWidget.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQwtPlot.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuTextDialog.cpp
diff --git a/ApplicationCode/UserInterface/RiuSelectionManager.cpp b/ApplicationCode/UserInterface/Riu3dSelectionManager.cpp
similarity index 93%
rename from ApplicationCode/UserInterface/RiuSelectionManager.cpp
rename to ApplicationCode/UserInterface/Riu3dSelectionManager.cpp
index 39da507361..93d7dbdc4f 100644
--- a/ApplicationCode/UserInterface/RiuSelectionManager.cpp
+++ b/ApplicationCode/UserInterface/Riu3dSelectionManager.cpp
@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "RimGridView.h"
 #include "RimEclipseView.h"
@@ -35,7 +35,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuSelectionManager::RiuSelectionManager()
+Riu3dSelectionManager::Riu3dSelectionManager()
     : m_notificationCenter(new RiuSelectionChangedHandler)
 {
     m_selection.resize(2);
@@ -44,7 +44,7 @@ RiuSelectionManager::RiuSelectionManager()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuSelectionManager::~RiuSelectionManager()
+Riu3dSelectionManager::~Riu3dSelectionManager()
 {
     deleteAllItemsFromSelection(RUI_APPLICATION_GLOBAL);
     deleteAllItemsFromSelection(RUI_TEMPORARY);
@@ -55,16 +55,16 @@ RiuSelectionManager::~RiuSelectionManager()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuSelectionManager* RiuSelectionManager::instance()
+Riu3dSelectionManager* Riu3dSelectionManager::instance()
 {
-    static RiuSelectionManager* singleton = new RiuSelectionManager;
+    static Riu3dSelectionManager* singleton = new Riu3dSelectionManager;
     return singleton;
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuSelectionManager::selectedItems(std::vector<RiuSelectionItem*>& items, int role) const
+void Riu3dSelectionManager::selectedItems(std::vector<RiuSelectionItem*>& items, int role) const
 {
     const std::vector<RiuSelectionItem*>& s = m_selection[role];
 
@@ -75,7 +75,7 @@ void RiuSelectionManager::selectedItems(std::vector<RiuSelectionItem*>& items, i
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuSelectionItem* RiuSelectionManager::selectedItem(int role /*= RUI_APPLICATION_GLOBAL*/) const
+RiuSelectionItem* Riu3dSelectionManager::selectedItem(int role /*= RUI_APPLICATION_GLOBAL*/) const
 {
     const std::vector<RiuSelectionItem*>& s = m_selection[role];
 
@@ -93,7 +93,7 @@ RiuSelectionItem* RiuSelectionManager::selectedItem(int role /*= RUI_APPLICATION
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuSelectionManager::appendItemToSelection(RiuSelectionItem* item, int role)
+void Riu3dSelectionManager::appendItemToSelection(RiuSelectionItem* item, int role)
 {
     std::vector<RiuSelectionItem*>& s = m_selection[role];
 
@@ -105,7 +105,7 @@ void RiuSelectionManager::appendItemToSelection(RiuSelectionItem* item, int role
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuSelectionManager::setSelectedItem(RiuSelectionItem* item, int role)
+void Riu3dSelectionManager::setSelectedItem(RiuSelectionItem* item, int role)
 {
     deleteAllItemsFromSelection(role);
 
@@ -119,7 +119,7 @@ void RiuSelectionManager::setSelectedItem(RiuSelectionItem* item, int role)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuSelectionManager::deleteAllItems(int role)
+void Riu3dSelectionManager::deleteAllItems(int role)
 {
     if (!isEmpty(role))
     {
@@ -132,7 +132,7 @@ void RiuSelectionManager::deleteAllItems(int role)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RiuSelectionManager::isEmpty(int role) const
+bool Riu3dSelectionManager::isEmpty(int role) const
 {
     const std::vector<RiuSelectionItem*>& s = m_selection[role];
 
@@ -142,7 +142,7 @@ bool RiuSelectionManager::isEmpty(int role) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuSelectionManager::deleteAllItemsFromSelection(int role)
+void Riu3dSelectionManager::deleteAllItemsFromSelection(int role)
 {
     std::vector<RiuSelectionItem*>& s = m_selection[role];
 
diff --git a/ApplicationCode/UserInterface/RiuSelectionManager.h b/ApplicationCode/UserInterface/Riu3dSelectionManager.h
similarity index 97%
rename from ApplicationCode/UserInterface/RiuSelectionManager.h
rename to ApplicationCode/UserInterface/Riu3dSelectionManager.h
index b06af4fad8..0397c54a97 100644
--- a/ApplicationCode/UserInterface/RiuSelectionManager.h
+++ b/ApplicationCode/UserInterface/Riu3dSelectionManager.h
@@ -48,7 +48,7 @@ class RivWellPathSourceInfo;
 // 
 //
 //==================================================================================================
-class RiuSelectionManager
+class Riu3dSelectionManager
 {
 public:
     enum SelectionRole
@@ -58,7 +58,7 @@ public:
     };
 
 public:
-    static RiuSelectionManager* instance();
+    static Riu3dSelectionManager* instance();
 
     // Returns selected items
     // Selection manager owns the selection items
@@ -84,9 +84,9 @@ public:
     bool isEmpty(int role = RUI_APPLICATION_GLOBAL) const;
 
 private:
-    RiuSelectionManager();
-    ~RiuSelectionManager();
-    RiuSelectionManager(const RiuSelectionManager&) = delete;
+    Riu3dSelectionManager();
+    ~Riu3dSelectionManager();
+    Riu3dSelectionManager(const Riu3dSelectionManager&) = delete;
 
     void deleteAllItemsFromSelection(int role);
 
diff --git a/ApplicationCode/UserInterface/RiuMohrsCirclePlot.cpp b/ApplicationCode/UserInterface/RiuMohrsCirclePlot.cpp
index 7eac3f6953..d37ec79db0 100644
--- a/ApplicationCode/UserInterface/RiuMohrsCirclePlot.cpp
+++ b/ApplicationCode/UserInterface/RiuMohrsCirclePlot.cpp
@@ -20,7 +20,7 @@
 
 #include "RiaColorTables.h"
 
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 #include "RiuSummaryQwtPlot.h"
 
 #include "RigFemPart.h"
diff --git a/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp b/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp
index d0126d8412..3fbf55ff93 100644
--- a/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp
+++ b/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp
@@ -19,7 +19,7 @@
 #include "RiuPvtPlotUpdater.h"
 #include "RiuPvtPlotPanel.h"
 #include "RiuRelativePermeabilityPlotUpdater.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "RigEclipseCaseData.h"
 #include "RigGridBase.h"
@@ -118,7 +118,7 @@ void RiuPvtPlotUpdater::updateOnTimeStepChanged(Rim3dView* changedView)
     }
 
     // Fetch the current global selection and only continue if the selection's view matches the view with time step change
-    const RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(RiuSelectionManager::instance()->selectedItem());
+    const RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(Riu3dSelectionManager::instance()->selectedItem());
     if (eclipseSelectionItem && eclipseSelectionItem->m_view == eclipseView)
     {
         const size_t gridIndex = eclipseSelectionItem->m_gridIndex;
diff --git a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp
index 2683be34d6..e6a1fa347e 100644
--- a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp
+++ b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp
@@ -18,7 +18,7 @@
 
 #include "RiuRelativePermeabilityPlotUpdater.h"
 #include "RiuRelativePermeabilityPlotPanel.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include "RigEclipseCaseData.h"
 #include "RigGridBase.h"
@@ -118,7 +118,7 @@ void RiuRelativePermeabilityPlotUpdater::updateOnTimeStepChanged(Rim3dView* chan
     }
 
     // Fetch the current global selection and only continue if the selection's view matches the view with time step change
-    const RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(RiuSelectionManager::instance()->selectedItem());
+    const RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(Riu3dSelectionManager::instance()->selectedItem());
     if (eclipseSelectionItem && eclipseSelectionItem->m_view == eclipseView)
     {
         const size_t gridIndex = eclipseSelectionItem->m_gridIndex;
diff --git a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
index 69e86f26dd..2975fb24cf 100644
--- a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
+++ b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
@@ -48,7 +48,7 @@
 #include "RiuRelativePermeabilityPlotUpdater.h"
 #include "RiuResultQwtPlot.h"
 #include "RiuResultTextBuilder.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 
 #include <QStatusBar>
 
diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
index 2b7b00893f..f55d072393 100644
--- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
@@ -64,7 +64,7 @@
 
 #include "RiuMainWindow.h"
 #include "RiuResultTextBuilder.h"
-#include "RiuSelectionManager.h"
+#include "Riu3dSelectionManager.h"
 #include "RiuViewer.h"
 #include "RiuPickItemInfo.h"
 
@@ -253,7 +253,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
                 m_currentFaceIndex = cvf::StructGridInterface::NO_FACE;
 
                 RiuSelectionItem* selItem = new RiuGeneralSelectionItem(crossSectionSourceInfo->crossSection());
-                RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
+                Riu3dSelectionManager::instance()->setSelectedItem(selItem, Riu3dSelectionManager::RUI_TEMPORARY);
                 
                 if (gridView)
                 {
@@ -273,7 +273,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
                 m_currentFaceIndex = cvf::StructGridInterface::NO_FACE;
 
                 RiuSelectionItem* selItem = new RiuGeneralSelectionItem(intersectionBoxSourceInfo->intersectionBox());
-                RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
+                Riu3dSelectionManager::instance()->setSelectedItem(selItem, Riu3dSelectionManager::RUI_TEMPORARY);
 
                 menuBuilder << "RicHideIntersectionBoxFeature";
                 menuBuilder.addSeparator();
@@ -374,7 +374,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
                     double measuredDepth         = wellPathSourceInfo->measuredDepth(firstPartTriangleIndex, pickedPositionInUTM);
                     cvf::Vec3d closestPointOnCenterLine = wellPathSourceInfo->closestPointOnCenterLine(firstPartTriangleIndex, pickedPositionInUTM);
                     RiuSelectionItem* selItem = new RiuWellPathSelectionItem(wellPathSourceInfo, closestPointOnCenterLine, measuredDepth);
-                    RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
+                    Riu3dSelectionManager::instance()->setSelectedItem(selItem, Riu3dSelectionManager::RUI_TEMPORARY);
                 }
 
                 //TODO: Update so these also use RiuWellPathSelectionItem 
@@ -431,7 +431,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
                 caf::SelectionManager::instance()->setSelectedItem(well);
 
                 RiuSelectionItem* selItem = new RiuSimWellSelectionItem(eclipseWellSourceInfo->well(), m_currentPickPositionInDomainCoords, eclipseWellSourceInfo->branchIndex());
-                RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
+                Riu3dSelectionManager::instance()->setSelectedItem(selItem, Riu3dSelectionManager::RUI_TEMPORARY);
 
                 menuBuilder << "RicNewWellLogCurveExtractionFeature";
                 menuBuilder << "RicNewWellLogRftCurveFeature";
@@ -497,7 +497,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
     }
 
     // Delete items in temporary selection
-    RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_TEMPORARY);
+    Riu3dSelectionManager::instance()->deleteAllItems(Riu3dSelectionManager::RUI_TEMPORARY);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -824,7 +824,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
 
     if (cellIndex == cvf::UNDEFINED_SIZE_T)
     {
-        RiuSelectionManager::instance()->deleteAllItems();
+        Riu3dSelectionManager::instance()->deleteAllItems();
     }
     else 
     {
@@ -835,7 +835,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
         }
 
         std::vector<RiuSelectionItem*> items;
-        RiuSelectionManager::instance()->selectedItems(items);
+        Riu3dSelectionManager::instance()->selectedItems(items);
 
         const caf::ColorTable& colorTable = RiaColorTables::selectionPaletteColors();
 
@@ -874,11 +874,11 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
 
         if (appendToSelection)
         {
-            RiuSelectionManager::instance()->appendItemToSelection(selItem);
+            Riu3dSelectionManager::instance()->appendItemToSelection(selItem);
         }
         else if(selItem)
         {
-            RiuSelectionManager::instance()->setSelectedItem(selItem);
+            Riu3dSelectionManager::instance()->setSelectedItem(selItem);
         }
     }