diff --git a/ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp b/ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
index c179a8de3e..96e8af90ac 100644
--- a/ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
@@ -26,7 +26,7 @@
 #include "RigMainGrid.h"
 
 #include "RimEclipseCase.h"
-#include "RimFault.h"
+#include "RimFaultInView.h"
 
 #include "cafSelectionManager.h"
 #include "cafUtils.h"
@@ -44,7 +44,7 @@ CAF_CMD_SOURCE_INIT(RicExportFaultsFeature, "RicExportFaultsFeature");
 //--------------------------------------------------------------------------------------------------
 bool RicExportFaultsFeature::isCommandEnabled()
 {
-    std::vector<RimFault*> selectedFaults;
+    std::vector<RimFaultInView*> selectedFaults;
 
     caf::SelectionManager::instance()->objectsByType(&selectedFaults);
 
@@ -58,7 +58,7 @@ void RicExportFaultsFeature::onActionTriggered(bool isChecked)
 {
     this->disableModelChangeContribution();
 
-    std::vector<RimFault*> selectedFaults;
+    std::vector<RimFaultInView*> selectedFaults;
 
     caf::SelectionManager::instance()->objectsByType(&selectedFaults);
 
@@ -76,7 +76,7 @@ void RicExportFaultsFeature::onActionTriggered(bool isChecked)
         return;
     }
 
-    for (RimFault* rimFault : selectedFaults)
+    for (RimFaultInView* rimFault : selectedFaults)
     {
         RimEclipseCase* eclCase = nullptr;
         rimFault->firstAncestorOrThisOfType(eclCase);
diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
index 804636190e..c2af9c7c88 100644
--- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
@@ -29,7 +29,7 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
-#include "RimFault.h"
+#include "RimFaultInView.h"
 #include "RimFaultCollection.h"
 #include "RimLegendConfig.h"
 #include "RimTernaryLegendConfig.h"
@@ -55,7 +55,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFault* rimFault)
+RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault)
     :   m_grid(grid),
         m_rimFaultCollection(rimFaultCollection),
         m_rimFault(rimFault),
@@ -451,7 +451,7 @@ void RivFaultPartMgr::createLabelWithAnchorLine(const cvf::Part* part)
         
         cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
         {
-            RimFault* noConstRimFault = const_cast<RimFault*>(m_rimFault);
+            RimFaultInView* noConstRimFault = const_cast<RimFaultInView*>(m_rimFault);
             if (noConstRimFault)
             {
                 RimFaultCollection* parentObject;
diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.h b/ApplicationCode/ModelVisualization/RivFaultPartMgr.h
index 1253deddd7..5300a9ca76 100644
--- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.h
@@ -38,7 +38,7 @@ class RimCellEdgeColors;
 class RimFaultCollection;
 class RigGridBase;
 class RimFaultCollection;
-class RimFault;
+class RimFaultInView;
 class RivFaultGeometryGenerator;
 class RivNNCGeometryGenerator;
 
@@ -51,7 +51,7 @@ class RivNNCGeometryGenerator;
 class RivFaultPartMgr : public cvf::Object
 {
 public:
-    RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFault* rimFault);
+    RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault);
 
     void setCellVisibility(cvf::UByteArray* cellVisibilities);
 
@@ -79,7 +79,7 @@ private:
     static cvf::Vec3f findClosestVertex(const cvf::Vec3f& point, const cvf::Vec3fArray* vertices);
 private:
     cvf::cref<RigGridBase>      m_grid;
-    const RimFault*             m_rimFault;
+    const RimFaultInView*             m_rimFault;
     const RimFaultCollection*   m_rimFaultCollection;
 
     float                       m_opacityLevel;
diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
index 0508bf5306..d385507ece 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
@@ -25,7 +25,7 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
-#include "RimFault.h"
+#include "RimFaultInView.h"
 #include "RimFaultCollection.h"
 
 #include "RivFaultPartMgr.h"
@@ -125,7 +125,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
 
     for (size_t i = 0; i < faultCollection->faults.size(); i++)
     {
-        const RimFault* rimFault = faultCollection->faults[i];
+        const RimFaultInView* rimFault = faultCollection->faults[i];
 
         cvf::ref<RivFaultPartMgr> rivFaultPart = m_faultParts[i];
         CVF_ASSERT(rivFaultPart.notNull());
@@ -260,7 +260,7 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
 
     for (size_t i = 0; i < faultCollection->faults.size(); i++)
     {
-        const RimFault* rimFault = faultCollection->faults[i];
+        const RimFaultInView* rimFault = faultCollection->faults[i];
 
         cvf::ref<RivFaultPartMgr> rivFaultPart = m_faultParts[i];
         CVF_ASSERT(rivFaultPart.notNull());
diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
index 4fefc47a4f..0a7e564f31 100644
--- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
+++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
@@ -32,7 +32,7 @@
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseStatisticsCase.h"
 #include "RimEclipseView.h"
-#include "RimFault.h"
+#include "RimFaultInView.h"
 #include "RimFlowCharacteristicsPlot.h"
 #include "RimFlowDiagSolution.h"
 #include "RimFlowPlotCollection.h"
@@ -382,7 +382,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
             commandIds << "Separator";
             commandIds << "RicReloadFormationNamesFeature";
         }
-        else if ( dynamic_cast<RimFault*>(uiItem) )
+        else if ( dynamic_cast<RimFaultInView*>(uiItem) )
         {
             commandIds << "RicExportFaultsFeature";
         }
@@ -522,7 +522,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
         {
             commandIds << "RicExportToLasFileFeature";
         }
-        else if (dynamic_cast<RimFault*>(uiItem) )
+        else if (dynamic_cast<RimFaultInView*>(uiItem) )
         {
             commandIds << "RicExportFaultsFeature";
         }
diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
index 8f87d1478d..23a757ac19 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
@@ -28,7 +28,7 @@
 #include "RiaDefines.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimFault.h"
+#include "RimFaultInView.h"
 #include "RimNoCommonAreaNNC.h"
 #include "RimNoCommonAreaNncCollection.h"
 
@@ -155,7 +155,7 @@ caf::PdmFieldHandle* RimFaultCollection::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFault* RimFaultCollection::findFaultByName(QString name)
+RimFaultInView* RimFaultCollection::findFaultByName(QString name)
 {
     for (size_t i = 0; i < this->faults().size(); ++i)
     {
@@ -236,16 +236,16 @@ void RimFaultCollection::syncronizeFaults()
 
     // Find faults with 
 
-    std::vector<caf::PdmPointer<RimFault> > newFaults;
+    std::vector<caf::PdmPointer<RimFaultInView> > newFaults;
 
     // Find corresponding fault from data model, or create a new
     for (size_t fIdx = 0; fIdx < rigFaults.size(); ++fIdx)
     {
-        RimFault* rimFault = this->findFaultByName(rigFaults[fIdx]->name());
+        RimFaultInView* rimFault = this->findFaultByName(rigFaults[fIdx]->name());
 
         if (!rimFault)
         {
-            rimFault = new RimFault();
+            rimFault = new RimFaultInView();
             rimFault->faultColor = colorTable.cycledColor3f(fIdx);
             QString faultName = rigFaults[fIdx]->name();
 
diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.h b/ApplicationCode/ProjectDataModel/RimFaultCollection.h
index 870704fb98..f7596c32eb 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.h
@@ -34,8 +34,8 @@
 
 #include <QString>
 
-class RimFault;
 class RimEclipseView;
+class RimFaultInView;
 class RimNoCommonAreaNncCollection;
 
 //==================================================================================================
@@ -80,8 +80,8 @@ public:
     caf::PdmField<bool>                 showNNCs;
     caf::PdmField<bool>                 hideNncsWhenNoResultIsAvailable;
 
-    caf::PdmChildArrayField<RimFault*>    faults;
-    RimFault*                           findFaultByName(QString name);
+    caf::PdmChildArrayField<RimFaultInView*>    faults;
+    RimFaultInView*                           findFaultByName(QString name);
 
     caf::PdmChildField<RimNoCommonAreaNncCollection*> noCommonAreaNnncCollection;
 
diff --git a/ApplicationCode/ProjectDataModel/RimFault.cpp b/ApplicationCode/ProjectDataModel/RimFaultInView.cpp
similarity index 86%
rename from ApplicationCode/ProjectDataModel/RimFault.cpp
rename to ApplicationCode/ProjectDataModel/RimFaultInView.cpp
index c8e80b04a1..fe03f5a3df 100644
--- a/ApplicationCode/ProjectDataModel/RimFault.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFaultInView.cpp
@@ -17,18 +17,18 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimFault.h"
+#include "RimFaultInView.h"
 
 #include "RigFault.h"
 
 #include "RimEclipseView.h"
 
-CAF_PDM_SOURCE_INIT(RimFault, "Fault");
+CAF_PDM_SOURCE_INIT(RimFaultInView, "Fault");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFault::RimFault()
+RimFaultInView::RimFaultInView()
 {
     CAF_PDM_InitObject("RimFault", ":/draw_style_faults_24x24.png", "", "");
 
@@ -47,14 +47,14 @@ RimFault::RimFault()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFault::~RimFault()
+RimFaultInView::~RimFaultInView()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimFault::userDescriptionField()
+caf::PdmFieldHandle* RimFaultInView::userDescriptionField()
 {
     return &name;
 }
@@ -62,7 +62,7 @@ caf::PdmFieldHandle* RimFault::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFault::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimFaultInView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     this->updateUiIconFromToggleField();
 
@@ -82,7 +82,7 @@ void RimFault::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const Q
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimFault::objectToggleField()
+caf::PdmFieldHandle* RimFaultInView::objectToggleField()
 {
     return &showFault;
 }
@@ -90,7 +90,7 @@ caf::PdmFieldHandle* RimFault::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFault::setFaultGeometry(const RigFault* faultGeometry)
+void RimFaultInView::setFaultGeometry(const RigFault* faultGeometry)
 {
     m_rigFault = faultGeometry;
 
@@ -100,7 +100,7 @@ void RimFault::setFaultGeometry(const RigFault* faultGeometry)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const RigFault* RimFault::faultGeometry() const
+const RigFault* RimFaultInView::faultGeometry() const
 {
     return m_rigFault;
 }
diff --git a/ApplicationCode/ProjectDataModel/RimFault.h b/ApplicationCode/ProjectDataModel/RimFaultInView.h
similarity index 95%
rename from ApplicationCode/ProjectDataModel/RimFault.h
rename to ApplicationCode/ProjectDataModel/RimFaultInView.h
index b8aeaf91b4..5eb944b797 100644
--- a/ApplicationCode/ProjectDataModel/RimFault.h
+++ b/ApplicationCode/ProjectDataModel/RimFaultInView.h
@@ -34,13 +34,13 @@ class RigFault;
 ///  
 ///  
 //==================================================================================================
-class RimFault : public caf::PdmObject
+class RimFaultInView : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 public:
 
-    RimFault();
-    virtual ~RimFault();
+    RimFaultInView();
+    virtual ~RimFaultInView();
 
     void                                setFaultGeometry(const RigFault* faultGeometry);
     const RigFault*                     faultGeometry() const;
diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
index f03a9b603f..ce9e229899 100644
--- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
@@ -42,7 +42,7 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
-#include "RimFault.h"
+#include "RimFaultInView.h"
 #include "RimFaultCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
@@ -439,7 +439,7 @@ void RiuViewerCommands::slotHideFault()
     {
         QString faultName = fault->name();
 
-        RimFault* rimFault = eclipseView->faultCollection()->findFaultByName(faultName);
+        RimFaultInView* rimFault = eclipseView->faultCollection()->findFaultByName(faultName);
         if (rimFault)
         {
             rimFault->showFault.setValueWithFieldChanged(!rimFault->showFault);