diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake
index bfb3bff059..a17c498491 100644
--- a/ApplicationCode/Commands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/CMakeLists_files.cmake
@@ -11,12 +11,12 @@ ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.h
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.h
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewViewFeature.h
 ${CEE_CURRENT_LIST_DIR}RicEclipseCasePasteFeature.h
-${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterImpl.h
+${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterFeatureImpl.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertFeature.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertExec.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewFeature.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewExec.h
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterImpl.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.h
 ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.h
 ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.h
 ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.h
@@ -29,7 +29,7 @@ ${CEE_CURRENT_LIST_DIR}RicEclipseViewPasteFeature.h
 ${CEE_CURRENT_LIST_DIR}RicPropertyFilterNewExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertFeature.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewFeature.h
-${CEE_CURRENT_LIST_DIR}RicRangeFilterImpl.h
+${CEE_CURRENT_LIST_DIR}RicRangeFilterFeatureImpl.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.h
@@ -54,12 +54,12 @@ ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewViewFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipseCasePasteFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterImpl.cpp
+${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterFeatureImpl.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewExec.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterImpl.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.cpp
@@ -71,7 +71,7 @@ ${CEE_CURRENT_LIST_DIR}RicEclipseViewPasteFeature.cpp
 #${CEE_CURRENT_LIST_DIR}RicGridModelsImportInput.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicRangeFilterImpl.cpp
+${CEE_CURRENT_LIST_DIR}RicRangeFilterFeatureImpl.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.cpp
diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterImpl.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp
similarity index 88%
rename from ApplicationCode/Commands/RicEclipsePropertyFilterImpl.cpp
rename to ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp
index 5d59ab2f0f..431bf42ec8 100644
--- a/ApplicationCode/Commands/RicEclipsePropertyFilterImpl.cpp
+++ b/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp
@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicEclipsePropertyFilterImpl.h"
+#include "RicEclipsePropertyFilterFeatureImpl.h"
 
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipsePropertyFilterCollection.h"
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimEclipsePropertyFilter*> RicEclipsePropertyFilterImpl::selectedPropertyFilters()
+std::vector<RimEclipsePropertyFilter*> RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilters()
 {
     std::vector<RimEclipsePropertyFilter*> propertyFilters;
     caf::SelectionManager::instance()->objectsByType(&propertyFilters);
@@ -44,7 +44,7 @@ std::vector<RimEclipsePropertyFilter*> RicEclipsePropertyFilterImpl::selectedPro
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimEclipsePropertyFilterCollection*> RicEclipsePropertyFilterImpl::selectedPropertyFilterCollections()
+std::vector<RimEclipsePropertyFilterCollection*> RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilterCollections()
 {
     std::vector<RimEclipsePropertyFilterCollection*> propertyFilterCollections;
     caf::SelectionManager::instance()->objectsByType(&propertyFilterCollections);
@@ -55,7 +55,7 @@ std::vector<RimEclipsePropertyFilterCollection*> RicEclipsePropertyFilterImpl::s
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicEclipsePropertyFilterImpl::addPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection)
+void RicEclipsePropertyFilterFeatureImpl::addPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection)
 {
     RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
     propertyFilterCollection->propertyFilters.push_back(propertyFilter);
@@ -71,7 +71,7 @@ void RicEclipsePropertyFilterImpl::addPropertyFilter(RimEclipsePropertyFilterCol
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicEclipsePropertyFilterImpl::insertPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection, size_t index)
+void RicEclipsePropertyFilterFeatureImpl::insertPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection, size_t index)
 {
     RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
     propertyFilterCollection->propertyFilters.insertAt(index, propertyFilter);
@@ -86,7 +86,7 @@ void RicEclipsePropertyFilterImpl::insertPropertyFilter(RimEclipsePropertyFilter
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicEclipsePropertyFilterImpl::setDefaults(RimEclipsePropertyFilter* propertyFilter)
+void RicEclipsePropertyFilterFeatureImpl::setDefaults(RimEclipsePropertyFilter* propertyFilter)
 {
     CVF_ASSERT(propertyFilter);
 
diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterImpl.h b/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.h
similarity index 97%
rename from ApplicationCode/Commands/RicEclipsePropertyFilterImpl.h
rename to ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.h
index 2a0790b8b5..2a69b6a3c7 100644
--- a/ApplicationCode/Commands/RicEclipsePropertyFilterImpl.h
+++ b/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.h
@@ -27,7 +27,7 @@ class RimEclipsePropertyFilterCollection;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicEclipsePropertyFilterImpl
+class RicEclipsePropertyFilterFeatureImpl
 {
 public:
     static std::vector<RimEclipsePropertyFilter*>              selectedPropertyFilters();
diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterInsertExec.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertExec.cpp
index 7d0f983500..0eb7f9c956 100644
--- a/ApplicationCode/Commands/RicEclipsePropertyFilterInsertExec.cpp
+++ b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertExec.cpp
@@ -20,7 +20,7 @@
 #include "RicEclipsePropertyFilterInsertExec.h"
 
 
-#include "RicEclipsePropertyFilterImpl.h"
+#include "RicEclipsePropertyFilterFeatureImpl.h"
 
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipsePropertyFilterCollection.h"
@@ -63,7 +63,7 @@ void RicEclipsePropertyFilterInsertExec::redo()
     size_t index = propertyFilterCollection->propertyFilters.index(m_propertyFilter);
     CVF_ASSERT(index < propertyFilterCollection->propertyFilters.size());
 
-    RicEclipsePropertyFilterImpl::insertPropertyFilter(propertyFilterCollection, index);
+    RicEclipsePropertyFilterFeatureImpl::insertPropertyFilter(propertyFilterCollection, index);
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.cpp
index 6b5978d93e..9309b8114c 100644
--- a/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.cpp
+++ b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.cpp
@@ -20,7 +20,7 @@
 #include "RicEclipsePropertyFilterInsertFeature.h"
 
 #include "RicEclipsePropertyFilterInsertExec.h"
-#include "RicEclipsePropertyFilterImpl.h"
+#include "RicEclipsePropertyFilterFeatureImpl.h"
 
 #include "RimEclipsePropertyFilter.h"
 
@@ -37,7 +37,7 @@ CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterInsertFeature, "RicEclipsePropertyFi
 //--------------------------------------------------------------------------------------------------
 bool RicEclipsePropertyFilterInsertFeature::isCommandEnabled()
 {
-    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilterImpl::selectedPropertyFilters();
+    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilters();
     return propertyFilters.size() == 1;
 }
 
@@ -46,7 +46,7 @@ bool RicEclipsePropertyFilterInsertFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicEclipsePropertyFilterInsertFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilterImpl::selectedPropertyFilters();
+    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilters();
     if (propertyFilters.size() == 1)
     {
         RicEclipsePropertyFilterInsertExec* filterExec = new RicEclipsePropertyFilterInsertExec(propertyFilters[0]);
diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp
index d8ef401c03..0038db42f6 100644
--- a/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp
+++ b/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp
@@ -19,7 +19,7 @@
 
 #include "RicEclipsePropertyFilterNewExec.h"
 
-#include "RicEclipsePropertyFilterImpl.h"
+#include "RicEclipsePropertyFilterFeatureImpl.h"
 
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipsePropertyFilterCollection.h"
@@ -55,7 +55,7 @@ QString RicEclipsePropertyFilterNewExec::name()
 //--------------------------------------------------------------------------------------------------
 void RicEclipsePropertyFilterNewExec::redo()
 { 
-    RicEclipsePropertyFilterImpl::addPropertyFilter(m_propertyFilterCollection);
+    RicEclipsePropertyFilterFeatureImpl::addPropertyFilter(m_propertyFilterCollection);
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.cpp
index a8c3b812cd..ab4415d5c5 100644
--- a/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.cpp
+++ b/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.cpp
@@ -20,7 +20,7 @@
 #include "RicEclipsePropertyFilterNewFeature.h"
 
 #include "RicEclipsePropertyFilterNewExec.h"
-#include "RicEclipsePropertyFilterImpl.h"
+#include "RicEclipsePropertyFilterFeatureImpl.h"
 
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipsePropertyFilterCollection.h"
@@ -36,7 +36,7 @@ CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterNewFeature, "RicEclipsePropertyFilte
 //--------------------------------------------------------------------------------------------------
 bool RicEclipsePropertyFilterNewFeature::isCommandEnabled()
 {
-    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilterImpl::selectedPropertyFilterCollections();
+    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilterCollections();
     return filterCollections.size() == 1;
 }
 
@@ -45,7 +45,7 @@ bool RicEclipsePropertyFilterNewFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicEclipsePropertyFilterNewFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilterImpl::selectedPropertyFilterCollections();
+    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilterCollections();
     if (filterCollections.size() == 1)
     {
         RicEclipsePropertyFilterNewExec* filterExec = new RicEclipsePropertyFilterNewExec(filterCollections[0]);
diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp
similarity index 86%
rename from ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.cpp
rename to ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp
index c1ba944af7..390ebc1453 100644
--- a/ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.cpp
+++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp
@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicGeoMechPropertyFilterImpl.h"
+#include "RicGeoMechPropertyFilterFeatureImpl.h"
 
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechPropertyFilterCollection.h"
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimGeoMechPropertyFilter*> RicGeoMechPropertyFilterImpl::selectedPropertyFilters()
+std::vector<RimGeoMechPropertyFilter*> RicGeoMechPropertyFilterFeatureImpl::selectedPropertyFilters()
 {
     std::vector<RimGeoMechPropertyFilter*> propertyFilters;
     caf::SelectionManager::instance()->objectsByType(&propertyFilters);
@@ -44,7 +44,7 @@ std::vector<RimGeoMechPropertyFilter*> RicGeoMechPropertyFilterImpl::selectedPro
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimGeoMechPropertyFilterCollection*> RicGeoMechPropertyFilterImpl::selectedPropertyFilterCollections()
+std::vector<RimGeoMechPropertyFilterCollection*> RicGeoMechPropertyFilterFeatureImpl::selectedPropertyFilterCollections()
 {
     std::vector<RimGeoMechPropertyFilterCollection*> propertyFilterCollections;
     caf::SelectionManager::instance()->objectsByType(&propertyFilterCollections);
@@ -55,7 +55,7 @@ std::vector<RimGeoMechPropertyFilterCollection*> RicGeoMechPropertyFilterImpl::s
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicGeoMechPropertyFilterImpl::addPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection)
+void RicGeoMechPropertyFilterFeatureImpl::addPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection)
 {
     RimGeoMechPropertyFilter* propertyFilter = createPropertyFilter(propertyFilterCollection);
     CVF_ASSERT(propertyFilter);
@@ -71,7 +71,7 @@ void RicGeoMechPropertyFilterImpl::addPropertyFilter(RimGeoMechPropertyFilterCol
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicGeoMechPropertyFilterImpl::insertPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection, size_t index)
+void RicGeoMechPropertyFilterFeatureImpl::insertPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection, size_t index)
 {
     RimGeoMechPropertyFilter* propertyFilter = createPropertyFilter(propertyFilterCollection);
     CVF_ASSERT(propertyFilter);
@@ -87,7 +87,7 @@ void RicGeoMechPropertyFilterImpl::insertPropertyFilter(RimGeoMechPropertyFilter
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimGeoMechPropertyFilter* RicGeoMechPropertyFilterImpl::createPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection)
+RimGeoMechPropertyFilter* RicGeoMechPropertyFilterFeatureImpl::createPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection)
 {
     CVF_ASSERT(propertyFilterCollection);
 
@@ -102,7 +102,7 @@ RimGeoMechPropertyFilter* RicGeoMechPropertyFilterImpl::createPropertyFilter(Rim
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicGeoMechPropertyFilterImpl::setDefaults(RimGeoMechPropertyFilter* propertyFilter)
+void RicGeoMechPropertyFilterFeatureImpl::setDefaults(RimGeoMechPropertyFilter* propertyFilter)
 {
     CVF_ASSERT(propertyFilter);
 
diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.h b/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.h
similarity index 97%
rename from ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.h
rename to ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.h
index c4c29ea76e..bd445367b8 100644
--- a/ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.h
+++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.h
@@ -27,7 +27,7 @@ class RimGeoMechPropertyFilterCollection;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicGeoMechPropertyFilterImpl
+class RicGeoMechPropertyFilterFeatureImpl
 {
 public:
     static std::vector<RimGeoMechPropertyFilter*>              selectedPropertyFilters();
diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp
index 5990cc8030..3058d31aa0 100644
--- a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp
+++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp
@@ -20,7 +20,7 @@
 #include "RicGeoMechPropertyFilterInsertExec.h"
 
 
-#include "RicGeoMechPropertyFilterImpl.h"
+#include "RicGeoMechPropertyFilterFeatureImpl.h"
 
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechPropertyFilterCollection.h"
@@ -63,7 +63,7 @@ void RicGeoMechPropertyFilterInsertExec::redo()
     size_t index = propertyFilterCollection->propertyFilters.index(m_propertyFilter);
     CVF_ASSERT(index < propertyFilterCollection->propertyFilters.size());
 
-    RicGeoMechPropertyFilterImpl::insertPropertyFilter(propertyFilterCollection, index);
+    RicGeoMechPropertyFilterFeatureImpl::insertPropertyFilter(propertyFilterCollection, index);
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.cpp
index f232685d67..5a38c3dd62 100644
--- a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.cpp
+++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.cpp
@@ -20,7 +20,7 @@
 #include "RicGeoMechPropertyFilterInsertFeature.h"
 
 #include "RicGeoMechPropertyFilterInsertExec.h"
-#include "RicGeoMechPropertyFilterImpl.h"
+#include "RicGeoMechPropertyFilterFeatureImpl.h"
 
 #include "RimGeoMechPropertyFilter.h"
 
@@ -37,7 +37,7 @@ CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterInsertFeature, "RicGeoMechPropertyFi
 //--------------------------------------------------------------------------------------------------
 bool RicGeoMechPropertyFilterInsertFeature::isCommandEnabled()
 {
-    std::vector<RimGeoMechPropertyFilter*> propertyFilters = RicGeoMechPropertyFilterImpl::selectedPropertyFilters();
+    std::vector<RimGeoMechPropertyFilter*> propertyFilters = RicGeoMechPropertyFilterFeatureImpl::selectedPropertyFilters();
     return propertyFilters.size() == 1;
 }
 
@@ -46,7 +46,7 @@ bool RicGeoMechPropertyFilterInsertFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicGeoMechPropertyFilterInsertFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimGeoMechPropertyFilter*> propertyFilters = RicGeoMechPropertyFilterImpl::selectedPropertyFilters();
+    std::vector<RimGeoMechPropertyFilter*> propertyFilters = RicGeoMechPropertyFilterFeatureImpl::selectedPropertyFilters();
     if (propertyFilters.size() == 1)
     {
         RicGeoMechPropertyFilterInsertExec* filterExec = new RicGeoMechPropertyFilterInsertExec(propertyFilters[0]);
diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp
index 4a505109e5..e63ef16b06 100644
--- a/ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp
+++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp
@@ -19,7 +19,7 @@
 
 #include "RicGeoMechPropertyFilterNewExec.h"
 
-#include "RicGeoMechPropertyFilterImpl.h"
+#include "RicGeoMechPropertyFilterFeatureImpl.h"
 
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechPropertyFilterCollection.h"
@@ -55,7 +55,7 @@ QString RicGeoMechPropertyFilterNewExec::name()
 //--------------------------------------------------------------------------------------------------
 void RicGeoMechPropertyFilterNewExec::redo()
 { 
-    RicGeoMechPropertyFilterImpl::addPropertyFilter(m_propertyFilterCollection);
+    RicGeoMechPropertyFilterFeatureImpl::addPropertyFilter(m_propertyFilterCollection);
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.cpp
index e7624e9b12..55de4e3632 100644
--- a/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.cpp
+++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.cpp
@@ -20,7 +20,7 @@
 #include "RicGeoMechPropertyFilterNewFeature.h"
 
 #include "RicGeoMechPropertyFilterNewExec.h"
-#include "RicGeoMechPropertyFilterImpl.h"
+#include "RicGeoMechPropertyFilterFeatureImpl.h"
  
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechPropertyFilterCollection.h"
@@ -36,7 +36,7 @@ CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterNewFeature, "RicGeoMechPropertyFilte
 //--------------------------------------------------------------------------------------------------
 bool RicGeoMechPropertyFilterNewFeature::isCommandEnabled()
 {
-    std::vector<RimGeoMechPropertyFilterCollection*> filterCollections = RicGeoMechPropertyFilterImpl::selectedPropertyFilterCollections();
+    std::vector<RimGeoMechPropertyFilterCollection*> filterCollections = RicGeoMechPropertyFilterFeatureImpl::selectedPropertyFilterCollections();
     return filterCollections.size() == 1;
 }
 
@@ -45,7 +45,7 @@ bool RicGeoMechPropertyFilterNewFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicGeoMechPropertyFilterNewFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimGeoMechPropertyFilterCollection*> filterCollections = RicGeoMechPropertyFilterImpl::selectedPropertyFilterCollections();
+    std::vector<RimGeoMechPropertyFilterCollection*> filterCollections = RicGeoMechPropertyFilterFeatureImpl::selectedPropertyFilterCollections();
     if (filterCollections.size() == 1)
     {
         RicGeoMechPropertyFilterNewExec* filterExec = new RicGeoMechPropertyFilterNewExec(filterCollections[0]);
diff --git a/ApplicationCode/Commands/RicRangeFilterImpl.cpp b/ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
similarity index 90%
rename from ApplicationCode/Commands/RicRangeFilterImpl.cpp
rename to ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
index ee80ed426d..8b89bd242b 100644
--- a/ApplicationCode/Commands/RicRangeFilterImpl.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicRangeFilterImpl.h"
+#include "RicRangeFilterFeatureImpl.h"
 #include "RicRangeFilterNewExec.h"
 
 #include "RimCellRangeFilter.h"
@@ -30,7 +30,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicRangeFilterImpl::isRangeFilterCommandAvailable()
+bool RicRangeFilterFeatureImpl::isRangeFilterCommandAvailable()
 {
     return findRangeFilterCollection() != NULL;
 }
@@ -38,7 +38,7 @@ bool RicRangeFilterImpl::isRangeFilterCommandAvailable()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RicRangeFilterNewExec* RicRangeFilterImpl::createRangeFilterExecCommand()
+RicRangeFilterNewExec* RicRangeFilterFeatureImpl::createRangeFilterExecCommand()
 {
     RimCellRangeFilterCollection* rangeFilterCollection = findRangeFilterCollection();
 
@@ -50,7 +50,7 @@ RicRangeFilterNewExec* RicRangeFilterImpl::createRangeFilterExecCommand()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCellRangeFilterCollection* RicRangeFilterImpl::findRangeFilterCollection()
+RimCellRangeFilterCollection* RicRangeFilterFeatureImpl::findRangeFilterCollection()
 {
     RimCellRangeFilterCollection* rangeFilterCollection = NULL;
     
diff --git a/ApplicationCode/Commands/RicRangeFilterImpl.h b/ApplicationCode/Commands/RicRangeFilterFeatureImpl.h
similarity index 97%
rename from ApplicationCode/Commands/RicRangeFilterImpl.h
rename to ApplicationCode/Commands/RicRangeFilterFeatureImpl.h
index eba6140539..95639b9af8 100644
--- a/ApplicationCode/Commands/RicRangeFilterImpl.h
+++ b/ApplicationCode/Commands/RicRangeFilterFeatureImpl.h
@@ -25,7 +25,7 @@ class RimCellRangeFilterCollection;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicRangeFilterImpl
+class RicRangeFilterFeatureImpl
 {
 public:
     static bool isRangeFilterCommandAvailable();
diff --git a/ApplicationCode/Commands/RicRangeFilterNewFeature.cpp b/ApplicationCode/Commands/RicRangeFilterNewFeature.cpp
index d2f51e78b5..60b4938e92 100644
--- a/ApplicationCode/Commands/RicRangeFilterNewFeature.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterNewFeature.cpp
@@ -19,7 +19,7 @@
 
 #include "RicRangeFilterNewFeature.h"
 
-#include "RicRangeFilterImpl.h"
+#include "RicRangeFilterFeatureImpl.h"
 #include "RicRangeFilterNewExec.h"
 
 #include "RimCellRangeFilter.h"
@@ -38,7 +38,7 @@ CAF_CMD_SOURCE_INIT(RicRangeFilterNewFeature, "RicRangeFilterNew");
 //--------------------------------------------------------------------------------------------------
 bool RicRangeFilterNewFeature::isCommandEnabled()
 {
-    return RicRangeFilterImpl::isRangeFilterCommandAvailable();
+    return RicRangeFilterFeatureImpl::isRangeFilterCommandAvailable();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -46,7 +46,7 @@ bool RicRangeFilterNewFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicRangeFilterNewFeature::onActionTriggered(bool isChecked)
 {
-    RicRangeFilterNewExec* filterExec = RicRangeFilterImpl::createRangeFilterExecCommand();
+    RicRangeFilterNewExec* filterExec = RicRangeFilterFeatureImpl::createRangeFilterExecCommand();
 
     caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);
 }
diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.cpp
index 608c9e63a0..2a9e6f3d04 100644
--- a/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.cpp
@@ -20,7 +20,7 @@
 #include "RicRangeFilterNewSliceIFeature.h"
 
 #include "RicRangeFilterNewExec.h"
-#include "RicRangeFilterImpl.h"
+#include "RicRangeFilterFeatureImpl.h"
 
 #include "RimCellRangeFilter.h"
 #include "RimCellRangeFilterCollection.h"
@@ -37,7 +37,7 @@ CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceIFeature, "RicRangeFilterNewSliceI");
 //--------------------------------------------------------------------------------------------------
 bool RicRangeFilterNewSliceIFeature::isCommandEnabled()
 {
-    return RicRangeFilterImpl::isRangeFilterCommandAvailable();
+    return RicRangeFilterFeatureImpl::isRangeFilterCommandAvailable();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -45,7 +45,7 @@ bool RicRangeFilterNewSliceIFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicRangeFilterNewSliceIFeature::onActionTriggered(bool isChecked)
 {
-    RicRangeFilterNewExec* filterExec = RicRangeFilterImpl::createRangeFilterExecCommand();
+    RicRangeFilterNewExec* filterExec = RicRangeFilterFeatureImpl::createRangeFilterExecCommand();
     filterExec->m_iSlice = true;
 
     caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);
diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.cpp
index 61bbf1bca2..bbf6bab04c 100644
--- a/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.cpp
@@ -20,7 +20,7 @@
 #include "RicRangeFilterNewSliceJFeature.h"
 
 #include "RicRangeFilterNewExec.h"
-#include "RicRangeFilterImpl.h"
+#include "RicRangeFilterFeatureImpl.h"
 
 #include "RimCellRangeFilter.h"
 #include "RimCellRangeFilterCollection.h"
@@ -36,7 +36,7 @@ CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceJFeature, "RicRangeFilterNewSliceJ");
 //--------------------------------------------------------------------------------------------------
 bool RicRangeFilterNewSliceJFeature::isCommandEnabled()
 {
-    return RicRangeFilterImpl::isRangeFilterCommandAvailable();
+    return RicRangeFilterFeatureImpl::isRangeFilterCommandAvailable();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -44,7 +44,7 @@ bool RicRangeFilterNewSliceJFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicRangeFilterNewSliceJFeature::onActionTriggered(bool isChecked)
 {
-    RicRangeFilterNewExec* filterExec = RicRangeFilterImpl::createRangeFilterExecCommand();
+    RicRangeFilterNewExec* filterExec = RicRangeFilterFeatureImpl::createRangeFilterExecCommand();
     filterExec->m_jSlice = true;
 
     caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);
diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.cpp
index 55ff414a53..8f7659d5ff 100644
--- a/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.cpp
@@ -19,7 +19,7 @@
 
 #include "RicRangeFilterNewSliceKFeature.h"
 
-#include "RicRangeFilterImpl.h"
+#include "RicRangeFilterFeatureImpl.h"
 #include "RicRangeFilterNewExec.h"
 
 #include "RimCellRangeFilter.h"
@@ -37,7 +37,7 @@ CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceKFeature, "RicRangeFilterNewSliceK");
 //--------------------------------------------------------------------------------------------------
 bool RicRangeFilterNewSliceKFeature::isCommandEnabled()
 {
-    return RicRangeFilterImpl::isRangeFilterCommandAvailable();
+    return RicRangeFilterFeatureImpl::isRangeFilterCommandAvailable();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -45,7 +45,7 @@ bool RicRangeFilterNewSliceKFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicRangeFilterNewSliceKFeature::onActionTriggered(bool isChecked)
 {
-    RicRangeFilterNewExec* filterExec = RicRangeFilterImpl::createRangeFilterExecCommand();
+    RicRangeFilterNewExec* filterExec = RicRangeFilterFeatureImpl::createRangeFilterExecCommand();
     filterExec->m_kSlice = true;
 
     caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);