diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake b/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake
index db0dc6b75e..8e5edd1eb7 100644
--- a/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake
+++ b/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake
@@ -6,12 +6,12 @@ endif()
 
 set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RivFemPartGeometryGenerator.h
-${CEE_CURRENT_LIST_DIR}RivGeoMechPartMgr.h
+${CEE_CURRENT_LIST_DIR}RivFemPartPartMgr.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RivFemPartGeometryGenerator.cpp
-${CEE_CURRENT_LIST_DIR}RivGeoMechPartMgr.cpp
+${CEE_CURRENT_LIST_DIR}RivFemPartPartMgr.cpp
 )
 
 list(APPEND CODE_HEADER_FILES
diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.cpp b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.cpp
similarity index 94%
rename from ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.cpp
rename to ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.cpp
index c2a64fd3cd..078cbb2d98 100644
--- a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.cpp
+++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.cpp
@@ -49,7 +49,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivGeoMechPartMgr::RivGeoMechPartMgr(const RigFemPart* grid)
+RivFemPartPartMgr::RivFemPartPartMgr(const RigFemPart* grid)
 :   m_surfaceGenerator(grid), 
     m_grid(grid),
     m_opacityLevel(1.0f),
@@ -64,7 +64,7 @@ RivGeoMechPartMgr::RivGeoMechPartMgr(const RigFemPart* grid)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivGeoMechPartMgr::setTransform(cvf::Transform* scaleTransform)
+void RivFemPartPartMgr::setTransform(cvf::Transform* scaleTransform)
 {
     m_scaleTransform = scaleTransform;
 }
@@ -72,7 +72,7 @@ void RivGeoMechPartMgr::setTransform(cvf::Transform* scaleTransform)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivGeoMechPartMgr::setCellVisibility(cvf::UByteArray* cellVisibilities)
+void RivFemPartPartMgr::setCellVisibility(cvf::UByteArray* cellVisibilities)
 {
     CVF_ASSERT(m_scaleTransform.notNull());
     CVF_ASSERT(cellVisibilities);
@@ -84,7 +84,7 @@ void RivGeoMechPartMgr::setCellVisibility(cvf::UByteArray* cellVisibilities)
     generatePartGeometry(m_surfaceGenerator);
 }
 
-void RivGeoMechPartMgr::generatePartGeometry(RivFemPartGeometryGenerator& geoBuilder)
+void RivFemPartPartMgr::generatePartGeometry(RivFemPartGeometryGenerator& geoBuilder)
 {
     bool useBufferObjects = true;
     // Surface geometry
@@ -158,7 +158,7 @@ void RivGeoMechPartMgr::generatePartGeometry(RivFemPartGeometryGenerator& geoBui
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivGeoMechPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
+void RivFemPartPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
 {
     CVF_ASSERT(model != NULL);
 
@@ -169,7 +169,7 @@ void RivGeoMechPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivGeoMechPartMgr::updateCellColor(cvf::Color4f color)
+void RivFemPartPartMgr::updateCellColor(cvf::Color4f color)
 {
     if (m_surfaceFaces.isNull()) return;
 
@@ -203,7 +203,7 @@ void RivGeoMechPartMgr::updateCellColor(cvf::Color4f color)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivGeoMechPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot)
+void RivFemPartPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot)
 {
     CVF_ASSERT(cellResultSlot);
 
@@ -238,7 +238,7 @@ void RivGeoMechPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechRe
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivGeoMechPartMgr::~RivGeoMechPartMgr()
+RivFemPartPartMgr::~RivFemPartPartMgr()
 {
 
 }
diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h
similarity index 95%
rename from ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h
rename to ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h
index 3d79434454..c0e6344bea 100644
--- a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h
+++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h
@@ -44,11 +44,11 @@ class RigFemPart;
 ///
 //==================================================================================================
 
-class RivGeoMechPartMgr: public cvf::Object
+class RivFemPartPartMgr: public cvf::Object
 {
 public:
-    RivGeoMechPartMgr(const RigFemPart* grid);
-    ~RivGeoMechPartMgr();
+    RivFemPartPartMgr(const RigFemPart* grid);
+    ~RivFemPartPartMgr();
     void setTransform(cvf::Transform* scaleTransform);
     void setCellVisibility(cvf::UByteArray* cellVisibilities );
     cvf::ref<cvf::UByteArray>  cellVisibility() { return  m_cellVisibility;}