diff --git a/CMakeLists.txt b/CMakeLists.txt
index e56f8e5fa558add97d91b8754b39a78f9b7f425e..6858d4f4b1f0e6ad4206536a92e84428b46b7327 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Install location" FORCE)
 endif()
 set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
-
+ 
 #-----------------------------------------------------------------------------
 # Project install directories
 #-----------------------------------------------------------------------------
diff --git a/Examples/DeformableBody/DeformableBodyExample.cpp b/Examples/DeformableBody/DeformableBodyExample.cpp
index 63d3e634e886d96088840529e59886f053290e7c..a7494550ef9d87543588ef49b06d43e4d7f04629 100644
--- a/Examples/DeformableBody/DeformableBodyExample.cpp
+++ b/Examples/DeformableBody/DeformableBodyExample.cpp
@@ -21,7 +21,7 @@
 
 #include "imstkTimer.h"
 #include "imstkSimulationManager.h"
-#include "imstkDeformableObject.h"
+#include "imstkFeDeformableObject.h"
 #include "imstkBackwardEuler.h"
 #include "imstkNonLinearSystem.h"
 #include "imstkNewtonSolver.h"
diff --git a/Source/CollisionHandling/imstkPenaltyCH.cpp b/Source/CollisionHandling/imstkPenaltyCH.cpp
index b3a482040a49f1323be2fd7876eb9ac0e05a8b03..1e59fa12cbc584a16712229a5f7ccadb757da249 100644
--- a/Source/CollisionHandling/imstkPenaltyCH.cpp
+++ b/Source/CollisionHandling/imstkPenaltyCH.cpp
@@ -22,7 +22,7 @@
 #include "imstkPenaltyCH.h"
 #include "imstkCollidingObject.h"
 #include "imstkCollisionData.h"
-#include "imstkDeformableObject.h"
+#include "imstkFeDeformableObject.h"
 #include "imstkFEMDeformableBodyModel.h"
 #include "imstkLogger.h"
 #include "imstkParallelUtils.h"
diff --git a/Source/CollisionHandling/imstkPickingCH.cpp b/Source/CollisionHandling/imstkPickingCH.cpp
index ac70bb54389fc2dd923b6be4e8be87c827db9739..92f35e96a0543d4402b602db7208c97f6ababfc1 100644
--- a/Source/CollisionHandling/imstkPickingCH.cpp
+++ b/Source/CollisionHandling/imstkPickingCH.cpp
@@ -20,7 +20,7 @@ limitations under the License.
 =========================================================================*/
 
 #include "imstkPickingCH.h"
-#include "imstkDeformableObject.h"
+#include "imstkFeDeformableObject.h"
 #include "imstkParallelUtils.h"
 #include "imstkPointSet.h"
 #include "imstkFEMDeformableBodyModel.h"
diff --git a/Source/Scene/imstkObjectInteractionFactory.cpp b/Source/Scene/imstkObjectInteractionFactory.cpp
index eaba788f7d8d03002a21f191d9e6d3d32c89133b..0541f7448cf2c45a0df711427f2ffe55c8a857d3 100644
--- a/Source/Scene/imstkObjectInteractionFactory.cpp
+++ b/Source/Scene/imstkObjectInteractionFactory.cpp
@@ -25,7 +25,7 @@ limitations under the License.
 #include "imstkCollidingObject.h"
 #include "imstkCollisionData.h"
 #include "imstkCollisionDetection.h"
-#include "imstkDeformableObject.h"
+#include "imstkFeDeformableObject.h"
 #include "imstkLogger.h"
 #include "imstkPbdObject.h"
 #include "imstkPbdObjectCollisionPair.h"
diff --git a/Source/Scene/imstkScene.cpp b/Source/Scene/imstkScene.cpp
index 888b64ac509e9f0675357a2f46b79f8853c320ba..b7c06707d772bc16a32a57038f702ccef30960da 100644
--- a/Source/Scene/imstkScene.cpp
+++ b/Source/Scene/imstkScene.cpp
@@ -26,7 +26,7 @@
 #include "imstkCollisionGraph.h"
 #include "imstkCollisionPair.h"
 #include "imstkDebugRenderGeometry.h"
-#include "imstkDeformableObject.h"
+#include "imstkFeDeformableObject.h"
 #include "imstkDynamicObject.h"
 #include "imstkFEMDeformableBodyModel.h"
 #include "imstkInteractionPair.h"
diff --git a/Source/SceneEntities/Objects/imstkDeformableObject.cpp b/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp
similarity index 97%
rename from Source/SceneEntities/Objects/imstkDeformableObject.cpp
rename to Source/SceneEntities/Objects/imstkFeDeformableObject.cpp
index e4d1fb73f7da0a3df888484e3fa1bc0ce7d4ed8b..d49510a0a844bf161759b65d0e48874f1c08a1db 100644
--- a/Source/SceneEntities/Objects/imstkDeformableObject.cpp
+++ b/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp
@@ -19,7 +19,7 @@
 
 =========================================================================*/
 
-#include "imstkDeformableObject.h"
+#include "imstkFeDeformableObject.h"
 #include "imstkFEMDeformableBodyModel.h"
 #include "imstkLogger.h"
 
diff --git a/Source/SceneEntities/Objects/imstkDeformableObject.h b/Source/SceneEntities/Objects/imstkFeDeformableObject.h
similarity index 100%
rename from Source/SceneEntities/Objects/imstkDeformableObject.h
rename to Source/SceneEntities/Objects/imstkFeDeformableObject.h