diff --git a/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
index d879b21aec..2d68f57008 100644
--- a/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
@@ -23,7 +23,7 @@
 
 #include "RicLinkVisibleViewsFeatureUi.h"
 
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimProject.h"
 #include "RimView.h"
 #include "RimViewLinker.h"
diff --git a/ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp b/ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
index 5740abb2ab..38ab515b89 100644
--- a/ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
@@ -22,7 +22,7 @@
 #include "RiaApplication.h"
 #include "RimProject.h"
 #include "RimView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 #include "RimViewLinkerCollection.h"
 #include "RiuMainWindow.h"
diff --git a/ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp b/ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp
index 63870e773b..05efe680e9 100644
--- a/ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp
@@ -19,7 +19,7 @@
 
 #include "RicShowAllLinkedViewsFeature.h"
 
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimView.h"
 #include "RimViewLinker.h"
 
diff --git a/ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp b/ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp
index bbc29b7eb6..14d8522fb4 100644
--- a/ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp
@@ -22,7 +22,7 @@
 #include "RiaApplication.h"
 #include "RimProject.h"
 #include "RimView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 #include "RiuMainWindow.h"
 
diff --git a/ApplicationCode/Commands/ViewLink/RicUnLinkViewFeature.cpp b/ApplicationCode/Commands/ViewLink/RicUnLinkViewFeature.cpp
index 013c18c7e3..f7978677e1 100644
--- a/ApplicationCode/Commands/ViewLink/RicUnLinkViewFeature.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicUnLinkViewFeature.cpp
@@ -19,7 +19,7 @@
 
 #include "RicUnLinkViewFeature.h"
 
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimView.h"
 #include "RimViewLinker.h"
 
diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp
index a8d30c745e..ba76a26724 100644
--- a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp
+++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp
@@ -32,7 +32,7 @@
 
 #include "RigGeoMechCaseData.h"
 #include "RigFemPartResultsCollection.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 #include "RigCaseToCaseCellMapper.h"
 
diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
index 7e4348c3b0..d996ac188f 100644
--- a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
+++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
@@ -35,7 +35,7 @@
 #include "RigFemPartResultsCollection.h"
 #include "RimGeoMechPropertyFilterCollection.h"
 #include "RimView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
index 66549eb4ca..eceab07749 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
@@ -38,7 +38,7 @@
 #include "RimEclipseWellCollection.h"
 
 #include "RivGridPartMgr.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 #include "RigCaseToCaseCellMapper.h"
 
diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
index 369f60f035..ad1e0b2d39 100644
--- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
@@ -59,7 +59,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.h
 ${CEE_CURRENT_LIST_DIR}RimView.h
 ${CEE_CURRENT_LIST_DIR}RimCase.h
 ${CEE_CURRENT_LIST_DIR}RimTreeViewStateSerializer.h
-${CEE_CURRENT_LIST_DIR}RimViewLink.h
+${CEE_CURRENT_LIST_DIR}RimViewController.h
 ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlot.h
@@ -129,7 +129,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.cpp
 ${CEE_CURRENT_LIST_DIR}RimView.cpp
 ${CEE_CURRENT_LIST_DIR}RimCase.cpp
 ${CEE_CURRENT_LIST_DIR}RimTreeViewStateSerializer.cpp
-${CEE_CURRENT_LIST_DIR}RimViewLink.cpp
+${CEE_CURRENT_LIST_DIR}RimViewController.cpp
 ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlot.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
index e6e4d1f996..712f1e3ce0 100644
--- a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
@@ -31,7 +31,7 @@
 #include "RimEclipseView.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 
 #include "cafPdmUiEditorHandle.h"
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
index b543d80d50..09afb218d6 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
@@ -23,7 +23,7 @@
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
 #include "RimTernaryLegendConfig.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 
 #include "RiuMainWindow.h"
diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp
index 7b03a98ea1..ab5d5574ee 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp
@@ -23,7 +23,7 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseResultDefinition.h"
 #include "RimEclipseView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 
 #include "cafPdmUiEditorHandle.h"
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
index 1a9ecc647b..fa32669d53 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@@ -62,7 +62,7 @@
 
 #include <limits.h>
 #include "RimViewLinker.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 
 
 
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp
index b69a2632ae..e2e723a251 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp
@@ -21,7 +21,7 @@
 
 #include "RimLegendConfig.h"
 #include "RimView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 
 
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
index cdf2cb7318..15449a7683 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
@@ -22,7 +22,7 @@
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 
 #include "cvfAssert.h"
diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp
index ba7e81a4fc..b23700f9f2 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -40,7 +40,7 @@
 #include "RimGeoMechCase.h"
 #include "RimGeoMechModels.h"
 #include "RimIdenticalGridCaseGroup.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
 #include "RimScriptCollection.h"
diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp
index a38ba8304f..874aa49589 100644
--- a/ApplicationCode/ProjectDataModel/RimView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimView.cpp
@@ -9,7 +9,7 @@
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimViewLinker.h"
diff --git a/ApplicationCode/ProjectDataModel/RimViewLink.cpp b/ApplicationCode/ProjectDataModel/RimViewController.cpp
similarity index 99%
rename from ApplicationCode/ProjectDataModel/RimViewLink.cpp
rename to ApplicationCode/ProjectDataModel/RimViewController.cpp
index 526aacad04..6c5cd034c5 100644
--- a/ApplicationCode/ProjectDataModel/RimViewLink.cpp
+++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp
@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimViewLink.h"
+#include "RimViewController.h"
 
 #include "RiaApplication.h"
 
diff --git a/ApplicationCode/ProjectDataModel/RimViewLink.h b/ApplicationCode/ProjectDataModel/RimViewController.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimViewLink.h
rename to ApplicationCode/ProjectDataModel/RimViewController.h
diff --git a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp
index bd534d6f08..937e49e733 100644
--- a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp
+++ b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp
@@ -34,7 +34,7 @@
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechResultDefinition.h"
 #include "RimGeoMechView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimProject.h"
 #include "RimView.h"
 #include "RimViewLinkerCollection.h"
diff --git a/ApplicationCode/ProjectDataModel/RimViewLinkerCollection.cpp b/ApplicationCode/ProjectDataModel/RimViewLinkerCollection.cpp
index 2ec37ad045..5f6ec52636 100644
--- a/ApplicationCode/ProjectDataModel/RimViewLinkerCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimViewLinkerCollection.cpp
@@ -20,7 +20,7 @@
 #include "RimViewLinkerCollection.h"
 
 #include "RimViewLinker.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 
 #include "cafPdmUiTreeOrdering.h"
 
diff --git a/ApplicationCode/UserInterface/RiuViewer.cpp b/ApplicationCode/UserInterface/RiuViewer.cpp
index a0786e6c87..cd83c8d651 100644
--- a/ApplicationCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationCode/UserInterface/RiuViewer.cpp
@@ -25,7 +25,7 @@
 
 #include "RimProject.h"
 #include "RimView.h"
-#include "RimViewLink.h"
+#include "RimViewController.h"
 #include "RimViewLinker.h"
 
 #include "RiuCadNavigation.h"