diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 0f84a4413e..9c9e323a52 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -40,7 +40,7 @@
 #include "RimOilField.h"
 #include "RimAnalysisModels.h"
 #include "RimFaultCollection.h"
-#include "RimFaultResultSettings.h"
+#include "RimFaultResultSlot.h"
 
 #include "cafCeetronNavigation.h"
 #include "cafCadNavigation.h"
diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
index fcf3c7d7f7..7a418eb3ba 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
@@ -28,7 +28,7 @@
 #include "RimFaultCollection.h"
 #include "RigMainGrid.h"
 #include "RimReservoirView.h"
-#include "RimFaultResultSettings.h"
+#include "RimFaultResultSlot.h"
 
 
 //--------------------------------------------------------------------------------------------------
@@ -183,7 +183,7 @@ void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimResultSlot
         RimFault* rimFault = faultCollection->faults[i];
 
         if (m_reservoirView->faultResultSettings()->showCustomFaultResult() &&
-            m_reservoirView->faultResultSettings()->visualizationMode() == RimFaultResultSettings::FAULT_COLOR)
+            m_reservoirView->faultResultSettings()->visualizationMode() == RimFaultResultSlot::FAULT_COLOR)
         {
             m_faultParts[i]->applySingleColorEffect();
         }
diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
index 656f19e48e..c9cb08a878 100644
--- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
@@ -48,7 +48,7 @@ ${CEE_CURRENT_LIST_DIR}RimFault.h
 ${CEE_CURRENT_LIST_DIR}RimFaultCollection.h
 ${CEE_CURRENT_LIST_DIR}RimMockModelSettings.h
 ${CEE_CURRENT_LIST_DIR}RimTernaryLegendConfig.h
-${CEE_CURRENT_LIST_DIR}RimFaultResultSettings.h
+${CEE_CURRENT_LIST_DIR}RimFaultResultSlot.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -95,7 +95,7 @@ ${CEE_CURRENT_LIST_DIR}RimFault.cpp
 ${CEE_CURRENT_LIST_DIR}RimFaultCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimMockModelSettings.cpp
 ${CEE_CURRENT_LIST_DIR}RimTernaryLegendConfig.cpp
-${CEE_CURRENT_LIST_DIR}RimFaultResultSettings.cpp
+${CEE_CURRENT_LIST_DIR}RimFaultResultSlot.cpp
 )
 
 list(APPEND CODE_HEADER_FILES
diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
index 250f5a00ee..752f4894f7 100644
--- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@@ -24,7 +24,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellPropertyFilterCollection.h"
 #include "RimFaultCollection.h"
-#include "RimFaultResultSettings.h"
+#include "RimFaultResultSlot.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimReservoirView.h"
 #include "RimResultSlot.h"
@@ -160,7 +160,7 @@ void Rim3dOverlayInfoConfig::update3DInfo()
             infoText += QString("<table border=0 cellspacing=5 ><tr><td>Min</td><td>P10</td> <td>Mean</td> <td>P90</td> <td>Max</td> </tr>" 
                                        "<tr><td>%1</td><td> %2</td><td> %3</td><td> %4</td><td> %5 </td></tr></table>").arg(min).arg(p10).arg(mean).arg(p90).arg(max);
 
-            if (m_reservoirView->faultResultSettings()->visualizationMode() != RimFaultResultSettings::FAULT_COLOR)
+            if (m_reservoirView->faultResultSettings()->visualizationMode() != RimFaultResultSlot::FAULT_COLOR)
             {
                 QString faultMapping;
                 bool isShowingGrid = m_reservoirView->faultCollection()->isGridVisualizationMode();
diff --git a/ApplicationCode/ProjectDataModel/RimFaultResultSettings.cpp b/ApplicationCode/ProjectDataModel/RimFaultResultSlot.cpp
similarity index 80%
rename from ApplicationCode/ProjectDataModel/RimFaultResultSettings.cpp
rename to ApplicationCode/ProjectDataModel/RimFaultResultSlot.cpp
index 9ba1391503..dfdbcadf48 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultResultSettings.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFaultResultSlot.cpp
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimFaultResultSettings.h"
+#include "RimFaultResultSlot.h"
 
 #include "RimReservoirView.h"
 #include "RimResultSlot.h"
@@ -27,27 +27,27 @@
 namespace caf
 {
     template<>
-    void AppEnum< RimFaultResultSettings::FaultVisualizationMode >::setUp()
+    void AppEnum< RimFaultResultSlot::FaultVisualizationMode >::setUp()
     {
-        addItem(RimFaultResultSettings::FAULT_COLOR,            "FAULT_COLOR",              "Fault Colors");
-        addItem(RimFaultResultSettings::CUSTOM_RESULT_MAPPING,  "CUSTOM_RESULT_MAPPING",    "Custom Cell Results");
-        setDefault(RimFaultResultSettings::FAULT_COLOR);
+        addItem(RimFaultResultSlot::FAULT_COLOR,            "FAULT_COLOR",              "Fault Colors");
+        addItem(RimFaultResultSlot::CUSTOM_RESULT_MAPPING,  "CUSTOM_RESULT_MAPPING",    "Custom Cell Results");
+        setDefault(RimFaultResultSlot::FAULT_COLOR);
     }
 }
 
-CAF_PDM_SOURCE_INIT(RimFaultResultSettings, "RimFaultResultSlot");
+CAF_PDM_SOURCE_INIT(RimFaultResultSlot, "RimFaultResultSlot");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFaultResultSettings::RimFaultResultSettings()
+RimFaultResultSlot::RimFaultResultSlot()
 {
     CAF_PDM_InitObject("Fault Result Slot", ":/draw_style_faults_24x24.png", "", "");
 
     CAF_PDM_InitField(&showCustomFaultResult,                "ShowCustomFaultResult",                 false,   "Show Custom Fault Result", "", "", "");
     showCustomFaultResult.setUiHidden(true);
 
-    CAF_PDM_InitField(&visualizationMode, "VisualizationMode", caf::AppEnum<RimFaultResultSettings::FaultVisualizationMode>(RimFaultResultSettings::FAULT_COLOR), "Fault Color Mapping", "", "", "");
+    CAF_PDM_InitField(&visualizationMode, "VisualizationMode", caf::AppEnum<RimFaultResultSlot::FaultVisualizationMode>(RimFaultResultSlot::FAULT_COLOR), "Fault Color Mapping", "", "", "");
     CAF_PDM_InitField(&showNNCs,                "ShowNNCs",                 false,   "Show NNCs", "", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_customFaultResult, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", "");
@@ -66,14 +66,14 @@ RimFaultResultSettings::RimFaultResultSettings()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFaultResultSettings::~RimFaultResultSettings()
+RimFaultResultSlot::~RimFaultResultSlot()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSettings::setReservoirView(RimReservoirView* ownerReservoirView)
+void RimFaultResultSlot::setReservoirView(RimReservoirView* ownerReservoirView)
 {
     m_reservoirView = ownerReservoirView;
     m_customFaultResult->setReservoirView(ownerReservoirView);
@@ -82,7 +82,7 @@ void RimFaultResultSettings::setReservoirView(RimReservoirView* ownerReservoirVi
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSettings::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimFaultResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     this->updateUiIconFromToggleField();
 
@@ -106,7 +106,7 @@ void RimFaultResultSettings::fieldChangedByUi(const caf::PdmFieldHandle* changed
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSettings::initAfterRead()
+void RimFaultResultSlot::initAfterRead()
 {
     m_customFaultResult->initAfterRead();
     updateFieldVisibility();
@@ -117,7 +117,7 @@ void RimFaultResultSettings::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSettings::updateFieldVisibility()
+void RimFaultResultSlot::updateFieldVisibility()
 {
     m_customFaultResult->updateFieldVisibility();
 }
@@ -125,7 +125,7 @@ void RimFaultResultSettings::updateFieldVisibility()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimResultSlot* RimFaultResultSettings::customFaultResult()
+RimResultSlot* RimFaultResultSlot::customFaultResult()
 {
     if (showCustomFaultResult() && this->visualizationMode() == CUSTOM_RESULT_MAPPING)
     {
@@ -138,7 +138,7 @@ RimResultSlot* RimFaultResultSettings::customFaultResult()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimFaultResultSettings::objectToggleField()
+caf::PdmFieldHandle* RimFaultResultSlot::objectToggleField()
 {
     return &showCustomFaultResult;
 }
@@ -146,7 +146,7 @@ caf::PdmFieldHandle* RimFaultResultSettings::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSettings::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimFaultResultSlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     uiOrdering.add(&visualizationMode);
     uiOrdering.add(&showNNCs);
@@ -163,7 +163,7 @@ void RimFaultResultSettings::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimFaultResultSettings::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
+QList<caf::PdmOptionItemInfo> RimFaultResultSlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
 {
     return m_customFaultResult->calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
 }
diff --git a/ApplicationCode/ProjectDataModel/RimFaultResultSettings.h b/ApplicationCode/ProjectDataModel/RimFaultResultSlot.h
similarity index 94%
rename from ApplicationCode/ProjectDataModel/RimFaultResultSettings.h
rename to ApplicationCode/ProjectDataModel/RimFaultResultSlot.h
index 3c07267547..07d4be9a53 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultResultSettings.h
+++ b/ApplicationCode/ProjectDataModel/RimFaultResultSlot.h
@@ -29,7 +29,7 @@ class RimReservoirView;
 ///  
 ///  
 //==================================================================================================
-class RimFaultResultSettings : public caf::PdmObject
+class RimFaultResultSlot : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 public:
@@ -40,8 +40,8 @@ public:
     };
 
 public:
-    RimFaultResultSettings();
-    virtual ~RimFaultResultSettings();
+    RimFaultResultSlot();
+    virtual ~RimFaultResultSlot();
     
     void setReservoirView(RimReservoirView* ownerReservoirView);
 
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
index e0eecb863d..fe969de1ac 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
@@ -28,7 +28,7 @@
 #include "RimCellPropertyFilterCollection.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimFaultCollection.h"
-#include "RimFaultResultSettings.h"
+#include "RimFaultResultSlot.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimResultSlot.h"
@@ -104,7 +104,7 @@ RimReservoirView::RimReservoirView()
     cellEdgeResult = new RimCellEdgeResultSlot();
 
     CAF_PDM_InitFieldNoDefault(&faultResultSettings,  "FaultResultSettings", "Fault Result", "", "", "");
-    faultResultSettings = new RimFaultResultSettings();
+    faultResultSettings = new RimFaultResultSlot();
 
     CAF_PDM_InitFieldNoDefault(&overlayInfoConfig,  "OverlayInfoConfig", "Info Box", "", "", "");
     overlayInfoConfig = new Rim3dOverlayInfoConfig();
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.h b/ApplicationCode/ProjectDataModel/RimReservoirView.h
index 4ae47bf513..36568bc8f0 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.h
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.h
@@ -44,7 +44,7 @@ class RimCellPropertyFilterCollection;
 class RimCellRangeFilter;
 class RimCellRangeFilterCollection;
 class RimFaultCollection;
-class RimFaultResultSettings;
+class RimFaultResultSlot;
 class RimReservoirCellResultsStorage;
 class RimReservoirCellResultsStorage;
 class RimResultSlot;
@@ -98,7 +98,7 @@ public:
 
     caf::PdmField<RimResultSlot*>                       cellResult;
     caf::PdmField<RimCellEdgeResultSlot*>               cellEdgeResult;
-    caf::PdmField<RimFaultResultSettings*>                  faultResultSettings;
+    caf::PdmField<RimFaultResultSlot*>                  faultResultSettings;
 
     caf::PdmField<RimCellRangeFilterCollection*>        rangeFilterCollection;
     caf::PdmField<RimCellPropertyFilterCollection*>     propertyFilterCollection;
diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.h b/ApplicationCode/ProjectDataModel/RimResultDefinition.h
index a725da96d8..462709a898 100644
--- a/ApplicationCode/ProjectDataModel/RimResultDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.h
@@ -70,7 +70,7 @@ protected:
     caf::PdmField<QString>                                          m_resultVariable;
 
     friend class RimCellPropertyFilter;
-    friend class RimFaultResultSettings;
+    friend class RimFaultResultSlot;
     // User interface only fields, to support "filtering"-like behaviour etc.
     caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > >      m_resultTypeUiField;
     caf::PdmField< caf::AppEnum< RimDefines::PorosityModelType > >  m_porosityModelUiField;
diff --git a/ApplicationCode/ProjectDataModel/RimResultSlot.h b/ApplicationCode/ProjectDataModel/RimResultSlot.h
index da5a8b932c..f39250f7ad 100644
--- a/ApplicationCode/ProjectDataModel/RimResultSlot.h
+++ b/ApplicationCode/ProjectDataModel/RimResultSlot.h
@@ -44,7 +44,7 @@ public:
     virtual void setResultVariable(const QString& resultName);
 
 protected:
-    friend class RimFaultResultSettings;
+    friend class RimFaultResultSlot;
     virtual void initAfterRead();
 
 private: