From 489353cd0ed85db6c4626146ad61b504c2b891da Mon Sep 17 00:00:00 2001
From: Jacob Moore <jacob.moore@kitware.com>
Date: Wed, 9 Feb 2022 16:40:55 -0500
Subject: [PATCH] COMP: Consistent case in filenames

---
 Examples/DeformableBody/DeformableBodyExample.cpp           | 2 +-
 Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp      | 4 ++--
 Examples/SPHFluid/Fluid.hpp                                 | 4 ++--
 Examples/SPHFluid/SPHFluidExample.hpp                       | 2 +-
 Examples/Vessel/vesselExample.cpp                           | 4 ++--
 .../Testing/imstkSurfaceMeshToSphereCDTest.cpp              | 1 +
 ...DCollisionHandling.cpp => imstkPbdCollisionHandling.cpp} | 0
 ...tkPBDCollisionHandling.h => imstkPbdCollisionHandling.h} | 0
 .../{imstkPBDPickingCH.cpp => imstkPbdPickingCH.cpp}        | 0
 .../{imstkPBDPickingCH.h => imstkPbdPickingCH.h}            | 0
 Source/CollisionHandling/imstkPenaltyCH.cpp                 | 2 +-
 ...HCollisionHandling.cpp => imstkSphCollisionHandling.cpp} | 4 ++--
 ...tkSPHCollisionHandling.h => imstkSphCollisionHandling.h} | 0
 ...{imstkPbdFEMConstraint.cpp => imstkPbdFemConstraint.cpp} | 0
 .../{imstkPbdFEMConstraint.h => imstkPbdFemConstraint.h}    | 0
 ...mstkPbdFEMTetConstraint.h => imstkPbdFemTetConstraint.h} | 0
 ...FEMForceModel.cpp => imstkCorotationalFemForceModel.cpp} | 0
 ...onalFEMForceModel.h => imstkCorotationalFemForceModel.h} | 0
 ...LinearFEMForceModel.cpp => imstkLinearFemForceModel.cpp} | 2 +-
 ...mstkLinearFEMForceModel.h => imstkLinearFemForceModel.h} | 0
 ...ormableBodyModel.cpp => imstkFemDeformableBodyModel.cpp} | 2 +-
 ...MDeformableBodyModel.h => imstkFemDeformableBodyModel.h} | 0
 Source/DynamicalModels/ObjectModels/imstkPbdModel.h         | 2 +-
 ...oundaryConditions.cpp => imstkSphBoundaryConditions.cpp} | 0
 ...SPHBoundaryConditions.h => imstkSphBoundaryConditions.h} | 0
 .../ObjectModels/{imstkSPHModel.cpp => imstkSphModel.cpp}   | 2 +-
 .../ObjectModels/{imstkSPHModel.h => imstkSphModel.h}       | 4 ++--
 .../ObjectStates/{imstkSPHState.cpp => imstkSphState.cpp}   | 2 +-
 .../ObjectStates/{imstkSPHState.h => imstkSphState.h}       | 0
 Source/Geometry/Analytic/imstkCapsule.cpp                   | 2 +-
 Source/Geometry/Analytic/imstkCapsule.h                     | 4 +++-
 Source/MeshIO/{imstkMSHMeshIO.cpp => imstkMshMeshIO.cpp}    | 0
 Source/MeshIO/{imstkMSHMeshIO.h => imstkMshMeshIO.h}        | 0
 Source/Scene/imstkPbdRigidObjectCollision.cpp               | 2 +-
 Source/Scene/imstkSphObjectCollision.cpp                    | 6 +++---
 Source/SceneEntities/Objects/imstkFeDeformableObject.cpp    | 2 +-
 .../Objects/{imstkSPHObject.cpp => imstkSphObject.cpp}      | 4 ++--
 .../Objects/{imstkSPHObject.h => imstkSphObject.h}          | 0
 Source/ViewerVTK/imstkVTKViewer.cpp                         | 2 +-
 39 files changed, 31 insertions(+), 28 deletions(-)
 rename Source/CollisionHandling/{imstkPBDCollisionHandling.cpp => imstkPbdCollisionHandling.cpp} (100%)
 rename Source/CollisionHandling/{imstkPBDCollisionHandling.h => imstkPbdCollisionHandling.h} (100%)
 rename Source/CollisionHandling/{imstkPBDPickingCH.cpp => imstkPbdPickingCH.cpp} (100%)
 rename Source/CollisionHandling/{imstkPBDPickingCH.h => imstkPbdPickingCH.h} (100%)
 rename Source/CollisionHandling/{imstkSPHCollisionHandling.cpp => imstkSphCollisionHandling.cpp} (98%)
 rename Source/CollisionHandling/{imstkSPHCollisionHandling.h => imstkSphCollisionHandling.h} (100%)
 rename Source/Constraint/PbdConstraints/{imstkPbdFEMConstraint.cpp => imstkPbdFemConstraint.cpp} (100%)
 rename Source/Constraint/PbdConstraints/{imstkPbdFEMConstraint.h => imstkPbdFemConstraint.h} (100%)
 rename Source/Constraint/PbdConstraints/{imstkPbdFEMTetConstraint.h => imstkPbdFemTetConstraint.h} (100%)
 rename Source/DynamicalModels/InternalForceModel/{imstkCorotationalFEMForceModel.cpp => imstkCorotationalFemForceModel.cpp} (100%)
 rename Source/DynamicalModels/InternalForceModel/{imstkCorotationalFEMForceModel.h => imstkCorotationalFemForceModel.h} (100%)
 rename Source/DynamicalModels/InternalForceModel/{imstkLinearFEMForceModel.cpp => imstkLinearFemForceModel.cpp} (98%)
 rename Source/DynamicalModels/InternalForceModel/{imstkLinearFEMForceModel.h => imstkLinearFemForceModel.h} (100%)
 rename Source/DynamicalModels/ObjectModels/{imstkFEMDeformableBodyModel.cpp => imstkFemDeformableBodyModel.cpp} (99%)
 rename Source/DynamicalModels/ObjectModels/{imstkFEMDeformableBodyModel.h => imstkFemDeformableBodyModel.h} (100%)
 rename Source/DynamicalModels/ObjectModels/{imstkSPHBoundaryConditions.cpp => imstkSphBoundaryConditions.cpp} (100%)
 rename Source/DynamicalModels/ObjectModels/{imstkSPHBoundaryConditions.h => imstkSphBoundaryConditions.h} (100%)
 rename Source/DynamicalModels/ObjectModels/{imstkSPHModel.cpp => imstkSphModel.cpp} (99%)
 rename Source/DynamicalModels/ObjectModels/{imstkSPHModel.h => imstkSphModel.h} (99%)
 rename Source/DynamicalModels/ObjectStates/{imstkSPHState.cpp => imstkSphState.cpp} (99%)
 rename Source/DynamicalModels/ObjectStates/{imstkSPHState.h => imstkSphState.h} (100%)
 rename Source/MeshIO/{imstkMSHMeshIO.cpp => imstkMshMeshIO.cpp} (100%)
 rename Source/MeshIO/{imstkMSHMeshIO.h => imstkMshMeshIO.h} (100%)
 rename Source/SceneEntities/Objects/{imstkSPHObject.cpp => imstkSphObject.cpp} (96%)
 rename Source/SceneEntities/Objects/{imstkSPHObject.h => imstkSphObject.h} (100%)

diff --git a/Examples/DeformableBody/DeformableBodyExample.cpp b/Examples/DeformableBody/DeformableBodyExample.cpp
index 5d9880ff6..4ac0406d7 100644
--- a/Examples/DeformableBody/DeformableBodyExample.cpp
+++ b/Examples/DeformableBody/DeformableBodyExample.cpp
@@ -23,7 +23,7 @@
 #include "imstkCamera.h"
 #include "imstkDirectionalLight.h"
 #include "imstkFeDeformableObject.h"
-#include "imstkFEMDeformableBodyModel.h"
+#include "imstkFemDeformableBodyModel.h"
 #include "imstkKeyboardSceneControl.h"
 #include "imstkLogger.h"
 #include "imstkMeshIO.h"
diff --git a/Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp b/Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp
index 5349a0d3a..cbc92ef28 100644
--- a/Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp
+++ b/Examples/SPH-Obj-SDF/SPH-Obj-SDFInteractionExample.cpp
@@ -30,8 +30,8 @@
 #include "imstkSceneManager.h"
 #include "imstkSignedDistanceField.h"
 #include "imstkSimulationManager.h"
-#include "imstkSPHModel.h"
-#include "imstkSPHObject.h"
+#include "imstkSphModel.h"
+#include "imstkSphObject.h"
 #include "imstkSphObjectCollision.h"
 #include "imstkSurfaceMesh.h"
 #include "imstkSurfaceMeshDistanceTransform.h"
diff --git a/Examples/SPHFluid/Fluid.hpp b/Examples/SPHFluid/Fluid.hpp
index f777614b9..3a3362f97 100644
--- a/Examples/SPHFluid/Fluid.hpp
+++ b/Examples/SPHFluid/Fluid.hpp
@@ -22,8 +22,8 @@
 #include "imstkPointSet.h"
 #include "imstkRenderMaterial.h"
 #include "imstkScene.h"
-#include "imstkSPHObject.h"
-#include "imstkSPHModel.h"
+#include "imstkSphObject.h"
+#include "imstkSphModel.h"
 #include "imstkVisualModel.h"
 
 using namespace imstk;
diff --git a/Examples/SPHFluid/SPHFluidExample.hpp b/Examples/SPHFluid/SPHFluidExample.hpp
index 323fa09fe..72bc8e552 100644
--- a/Examples/SPHFluid/SPHFluidExample.hpp
+++ b/Examples/SPHFluid/SPHFluidExample.hpp
@@ -27,7 +27,7 @@
 #include "imstkNew.h"
 #include "imstkSceneManager.h"
 #include "imstkSimulationManager.h"
-#include "imstkSPHObject.h"
+#include "imstkSphObject.h"
 #include "imstkSphObjectCollision.h"
 #include "imstkVTKTextStatusManager.h"
 #include "imstkVTKViewer.h"
diff --git a/Examples/Vessel/vesselExample.cpp b/Examples/Vessel/vesselExample.cpp
index 75e3e0503..87b7dfde3 100644
--- a/Examples/Vessel/vesselExample.cpp
+++ b/Examples/Vessel/vesselExample.cpp
@@ -31,8 +31,8 @@
 #include "imstkSceneManager.h"
 #include "imstkSignedDistanceField.h"
 #include "imstkSimulationManager.h"
-#include "imstkSPHModel.h"
-#include "imstkSPHObject.h"
+#include "imstkSphModel.h"
+#include "imstkSphObject.h"
 #include "imstkSphObjectCollision.h"
 #include "imstkSurfaceMesh.h"
 #include "imstkSurfaceMeshDistanceTransform.h"
diff --git a/Source/CollisionDetection/Testing/imstkSurfaceMeshToSphereCDTest.cpp b/Source/CollisionDetection/Testing/imstkSurfaceMeshToSphereCDTest.cpp
index e34f3c8c0..61780706e 100644
--- a/Source/CollisionDetection/Testing/imstkSurfaceMeshToSphereCDTest.cpp
+++ b/Source/CollisionDetection/Testing/imstkSurfaceMeshToSphereCDTest.cpp
@@ -42,6 +42,7 @@ TEST(imstkSurfaceMeshToSphereCDTest, IntersectionTestAB_Vertex)
     (*indicesPtr)[0] = Vec3i(0, 1, 2);
     surfMesh->initialize(verticesPtr, indicesPtr);
 
+    // manually test for collision
     SurfaceMeshToSphereCD m_colDetect;
     m_colDetect.setInput(surfMesh, 0);
     m_colDetect.setInput(sphere, 1);
diff --git a/Source/CollisionHandling/imstkPBDCollisionHandling.cpp b/Source/CollisionHandling/imstkPbdCollisionHandling.cpp
similarity index 100%
rename from Source/CollisionHandling/imstkPBDCollisionHandling.cpp
rename to Source/CollisionHandling/imstkPbdCollisionHandling.cpp
diff --git a/Source/CollisionHandling/imstkPBDCollisionHandling.h b/Source/CollisionHandling/imstkPbdCollisionHandling.h
similarity index 100%
rename from Source/CollisionHandling/imstkPBDCollisionHandling.h
rename to Source/CollisionHandling/imstkPbdCollisionHandling.h
diff --git a/Source/CollisionHandling/imstkPBDPickingCH.cpp b/Source/CollisionHandling/imstkPbdPickingCH.cpp
similarity index 100%
rename from Source/CollisionHandling/imstkPBDPickingCH.cpp
rename to Source/CollisionHandling/imstkPbdPickingCH.cpp
diff --git a/Source/CollisionHandling/imstkPBDPickingCH.h b/Source/CollisionHandling/imstkPbdPickingCH.h
similarity index 100%
rename from Source/CollisionHandling/imstkPBDPickingCH.h
rename to Source/CollisionHandling/imstkPbdPickingCH.h
diff --git a/Source/CollisionHandling/imstkPenaltyCH.cpp b/Source/CollisionHandling/imstkPenaltyCH.cpp
index c41336594..0637068cf 100644
--- a/Source/CollisionHandling/imstkPenaltyCH.cpp
+++ b/Source/CollisionHandling/imstkPenaltyCH.cpp
@@ -22,7 +22,7 @@
 #include "imstkPenaltyCH.h"
 #include "imstkCollisionData.h"
 #include "imstkFeDeformableObject.h"
-#include "imstkFEMDeformableBodyModel.h"
+#include "imstkFemDeformableBodyModel.h"
 #include "imstkParallelUtils.h"
 #include "imstkRbdConstraint.h"
 #include "imstkRigidObject2.h"
diff --git a/Source/CollisionHandling/imstkSPHCollisionHandling.cpp b/Source/CollisionHandling/imstkSphCollisionHandling.cpp
similarity index 98%
rename from Source/CollisionHandling/imstkSPHCollisionHandling.cpp
rename to Source/CollisionHandling/imstkSphCollisionHandling.cpp
index be1438409..3e1fccf75 100644
--- a/Source/CollisionHandling/imstkSPHCollisionHandling.cpp
+++ b/Source/CollisionHandling/imstkSphCollisionHandling.cpp
@@ -23,8 +23,8 @@
 #include "imstkCollisionData.h"
 #include "imstkCollisionDetectionAlgorithm.h"
 #include "imstkParallelFor.h"
-#include "imstkSPHModel.h"
-#include "imstkSPHObject.h"
+#include "imstkSphModel.h"
+#include "imstkSphObject.h"
 
 namespace imstk
 {
diff --git a/Source/CollisionHandling/imstkSPHCollisionHandling.h b/Source/CollisionHandling/imstkSphCollisionHandling.h
similarity index 100%
rename from Source/CollisionHandling/imstkSPHCollisionHandling.h
rename to Source/CollisionHandling/imstkSphCollisionHandling.h
diff --git a/Source/Constraint/PbdConstraints/imstkPbdFEMConstraint.cpp b/Source/Constraint/PbdConstraints/imstkPbdFemConstraint.cpp
similarity index 100%
rename from Source/Constraint/PbdConstraints/imstkPbdFEMConstraint.cpp
rename to Source/Constraint/PbdConstraints/imstkPbdFemConstraint.cpp
diff --git a/Source/Constraint/PbdConstraints/imstkPbdFEMConstraint.h b/Source/Constraint/PbdConstraints/imstkPbdFemConstraint.h
similarity index 100%
rename from Source/Constraint/PbdConstraints/imstkPbdFEMConstraint.h
rename to Source/Constraint/PbdConstraints/imstkPbdFemConstraint.h
diff --git a/Source/Constraint/PbdConstraints/imstkPbdFEMTetConstraint.h b/Source/Constraint/PbdConstraints/imstkPbdFemTetConstraint.h
similarity index 100%
rename from Source/Constraint/PbdConstraints/imstkPbdFEMTetConstraint.h
rename to Source/Constraint/PbdConstraints/imstkPbdFemTetConstraint.h
diff --git a/Source/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.cpp b/Source/DynamicalModels/InternalForceModel/imstkCorotationalFemForceModel.cpp
similarity index 100%
rename from Source/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.cpp
rename to Source/DynamicalModels/InternalForceModel/imstkCorotationalFemForceModel.cpp
diff --git a/Source/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.h b/Source/DynamicalModels/InternalForceModel/imstkCorotationalFemForceModel.h
similarity index 100%
rename from Source/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.h
rename to Source/DynamicalModels/InternalForceModel/imstkCorotationalFemForceModel.h
diff --git a/Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.cpp b/Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.cpp
similarity index 98%
rename from Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.cpp
rename to Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.cpp
index 4d2c3b85d..4fc05732c 100644
--- a/Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.cpp
+++ b/Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.cpp
@@ -19,7 +19,7 @@
 
 =========================================================================*/
 
-#include "imstkLinearFEMForceModel.h"
+#include "imstkLinearFemForceModel.h"
 
 #include "imstkMacros.h"
 
diff --git a/Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.h b/Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.h
similarity index 100%
rename from Source/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.h
rename to Source/DynamicalModels/InternalForceModel/imstkLinearFemForceModel.h
diff --git a/Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.cpp b/Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.cpp
similarity index 99%
rename from Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.cpp
rename to Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.cpp
index 03bf9f899..8ef6c6c45 100644
--- a/Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.cpp
+++ b/Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.cpp
@@ -19,7 +19,7 @@
 
 =========================================================================*/
 
-#include "imstkFEMDeformableBodyModel.h"
+#include "imstkFemDeformableBodyModel.h"
 #include "imstkConjugateGradient.h"
 #include "imstkCorotationalFemForceModel.h"
 #include "imstkIsotropicHyperelasticFeForceModel.h"
diff --git a/Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.h b/Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.h
similarity index 100%
rename from Source/DynamicalModels/ObjectModels/imstkFEMDeformableBodyModel.h
rename to Source/DynamicalModels/ObjectModels/imstkFemDeformableBodyModel.h
diff --git a/Source/DynamicalModels/ObjectModels/imstkPbdModel.h b/Source/DynamicalModels/ObjectModels/imstkPbdModel.h
index 1b1eff253..87661d7fb 100644
--- a/Source/DynamicalModels/ObjectModels/imstkPbdModel.h
+++ b/Source/DynamicalModels/ObjectModels/imstkPbdModel.h
@@ -23,7 +23,7 @@
 
 #include "imstkDynamicalModel.h"
 #include "imstkPbdCollisionConstraint.h"
-#include "imstkPbdFEMConstraint.h"
+#include "imstkPbdFemConstraint.h"
 #include "imstkPbdState.h"
 
 #include <unordered_map>
diff --git a/Source/DynamicalModels/ObjectModels/imstkSPHBoundaryConditions.cpp b/Source/DynamicalModels/ObjectModels/imstkSphBoundaryConditions.cpp
similarity index 100%
rename from Source/DynamicalModels/ObjectModels/imstkSPHBoundaryConditions.cpp
rename to Source/DynamicalModels/ObjectModels/imstkSphBoundaryConditions.cpp
diff --git a/Source/DynamicalModels/ObjectModels/imstkSPHBoundaryConditions.h b/Source/DynamicalModels/ObjectModels/imstkSphBoundaryConditions.h
similarity index 100%
rename from Source/DynamicalModels/ObjectModels/imstkSPHBoundaryConditions.h
rename to Source/DynamicalModels/ObjectModels/imstkSphBoundaryConditions.h
diff --git a/Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp b/Source/DynamicalModels/ObjectModels/imstkSphModel.cpp
similarity index 99%
rename from Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp
rename to Source/DynamicalModels/ObjectModels/imstkSphModel.cpp
index 88ea7113c..e100f0dbf 100644
--- a/Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp
+++ b/Source/DynamicalModels/ObjectModels/imstkSphModel.cpp
@@ -19,7 +19,7 @@ limitations under the License.
 
 =========================================================================*/
 
-#include "imstkSPHModel.h"
+#include "imstkSphModel.h"
 #include "imstkParallelUtils.h"
 #include "imstkPointSet.h"
 #include "imstkTaskGraph.h"
diff --git a/Source/DynamicalModels/ObjectModels/imstkSPHModel.h b/Source/DynamicalModels/ObjectModels/imstkSphModel.h
similarity index 99%
rename from Source/DynamicalModels/ObjectModels/imstkSPHModel.h
rename to Source/DynamicalModels/ObjectModels/imstkSphModel.h
index 1dac759aa..b14180a97 100644
--- a/Source/DynamicalModels/ObjectModels/imstkSPHModel.h
+++ b/Source/DynamicalModels/ObjectModels/imstkSphModel.h
@@ -22,10 +22,10 @@
 #pragma once
 
 #include "imstkDynamicalModel.h"
-#include "imstkSPHState.h"
+#include "imstkSphState.h"
 #include "imstkSPHKernels.h"
 #include "imstkNeighborSearch.h"
-#include "imstkSPHBoundaryConditions.h"
+#include "imstkSphBoundaryConditions.h"
 
 namespace imstk
 {
diff --git a/Source/DynamicalModels/ObjectStates/imstkSPHState.cpp b/Source/DynamicalModels/ObjectStates/imstkSphState.cpp
similarity index 99%
rename from Source/DynamicalModels/ObjectStates/imstkSPHState.cpp
rename to Source/DynamicalModels/ObjectStates/imstkSphState.cpp
index 36869cecf..6d0924d5b 100644
--- a/Source/DynamicalModels/ObjectStates/imstkSPHState.cpp
+++ b/Source/DynamicalModels/ObjectStates/imstkSphState.cpp
@@ -19,7 +19,7 @@
 
 =========================================================================*/
 
-#include "imstkSPHState.h"
+#include "imstkSphState.h"
 #include "imstkLogger.h"
 #include "imstkVecDataArray.h"
 
diff --git a/Source/DynamicalModels/ObjectStates/imstkSPHState.h b/Source/DynamicalModels/ObjectStates/imstkSphState.h
similarity index 100%
rename from Source/DynamicalModels/ObjectStates/imstkSPHState.h
rename to Source/DynamicalModels/ObjectStates/imstkSphState.h
diff --git a/Source/Geometry/Analytic/imstkCapsule.cpp b/Source/Geometry/Analytic/imstkCapsule.cpp
index 763ba79d6..6f6a7ddde 100644
--- a/Source/Geometry/Analytic/imstkCapsule.cpp
+++ b/Source/Geometry/Analytic/imstkCapsule.cpp
@@ -67,7 +67,7 @@ Capsule::getLength(DataType type /* = DataType::PostTransform */)
 void
 Capsule::setLength(const double l)
 {
-    CHECK(l > 0) << "Capsule::setHeight error: height should be positive.";
+    CHECK(l > 0) << "Capsule::setLength error: length should be positive.";
 
     m_length = l;
     m_transformApplied = false;
diff --git a/Source/Geometry/Analytic/imstkCapsule.h b/Source/Geometry/Analytic/imstkCapsule.h
index 2e67a2537..988e6fefb 100644
--- a/Source/Geometry/Analytic/imstkCapsule.h
+++ b/Source/Geometry/Analytic/imstkCapsule.h
@@ -28,7 +28,9 @@ namespace imstk
 ///
 /// \class Capsule
 ///
-/// \brief Capsule geometry, default configuration is at origin with length running up the y axes
+/// \brief Capsule geometry, default configuration is centered
+///        at origin with length running up and down the y axes.
+///        The length refers to the length of the cylinder.
 ///
 class Capsule : public AnalyticalGeometry
 {
diff --git a/Source/MeshIO/imstkMSHMeshIO.cpp b/Source/MeshIO/imstkMshMeshIO.cpp
similarity index 100%
rename from Source/MeshIO/imstkMSHMeshIO.cpp
rename to Source/MeshIO/imstkMshMeshIO.cpp
diff --git a/Source/MeshIO/imstkMSHMeshIO.h b/Source/MeshIO/imstkMshMeshIO.h
similarity index 100%
rename from Source/MeshIO/imstkMSHMeshIO.h
rename to Source/MeshIO/imstkMshMeshIO.h
diff --git a/Source/Scene/imstkPbdRigidObjectCollision.cpp b/Source/Scene/imstkPbdRigidObjectCollision.cpp
index c9d464442..b83effb86 100644
--- a/Source/Scene/imstkPbdRigidObjectCollision.cpp
+++ b/Source/Scene/imstkPbdRigidObjectCollision.cpp
@@ -23,7 +23,7 @@ limitations under the License.
 #include "imstkCDObjectFactory.h"
 #include "imstkCollisionData.h"
 #include "imstkCollisionDetectionAlgorithm.h"
-#include "imstkPBDCollisionHandling.h"
+#include "imstkPbdCollisionHandling.h"
 #include "imstkPbdModel.h"
 #include "imstkPbdObject.h"
 #include "imstkPbdSolver.h"
diff --git a/Source/Scene/imstkSphObjectCollision.cpp b/Source/Scene/imstkSphObjectCollision.cpp
index 3cb127eaf..338e3dd44 100644
--- a/Source/Scene/imstkSphObjectCollision.cpp
+++ b/Source/Scene/imstkSphObjectCollision.cpp
@@ -23,9 +23,9 @@ limitations under the License.
 #include "imstkCDObjectFactory.h"
 #include "imstkCollisionData.h"
 #include "imstkImplicitGeometryToPointSetCD.h"
-#include "imstkSPHCollisionHandling.h"
-#include "imstkSPHModel.h"
-#include "imstkSPHObject.h"
+#include "imstkSphCollisionHandling.h"
+#include "imstkSphModel.h"
+#include "imstkSphObject.h"
 #include "imstkTaskGraph.h"
 
 namespace imstk
diff --git a/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp b/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp
index bd3951bb0..b4643c714 100644
--- a/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp
+++ b/Source/SceneEntities/Objects/imstkFeDeformableObject.cpp
@@ -20,7 +20,7 @@
 =========================================================================*/
 
 #include "imstkFeDeformableObject.h"
-#include "imstkFEMDeformableBodyModel.h"
+#include "imstkFemDeformableBodyModel.h"
 #include "imstkLogger.h"
 
 namespace imstk
diff --git a/Source/SceneEntities/Objects/imstkSPHObject.cpp b/Source/SceneEntities/Objects/imstkSphObject.cpp
similarity index 96%
rename from Source/SceneEntities/Objects/imstkSPHObject.cpp
rename to Source/SceneEntities/Objects/imstkSphObject.cpp
index 764870ad1..ed59a099b 100644
--- a/Source/SceneEntities/Objects/imstkSPHObject.cpp
+++ b/Source/SceneEntities/Objects/imstkSphObject.cpp
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#include "imstkSPHObject.h"
-#include "imstkSPHModel.h"
+#include "imstkSphObject.h"
+#include "imstkSphModel.h"
 
 namespace imstk
 {
diff --git a/Source/SceneEntities/Objects/imstkSPHObject.h b/Source/SceneEntities/Objects/imstkSphObject.h
similarity index 100%
rename from Source/SceneEntities/Objects/imstkSPHObject.h
rename to Source/SceneEntities/Objects/imstkSphObject.h
diff --git a/Source/ViewerVTK/imstkVTKViewer.cpp b/Source/ViewerVTK/imstkVTKViewer.cpp
index 8a00eda92..39a4b55e7 100644
--- a/Source/ViewerVTK/imstkVTKViewer.cpp
+++ b/Source/ViewerVTK/imstkVTKViewer.cpp
@@ -63,7 +63,7 @@ VTKViewer::VTKViewer(std::string name) : AbstractVTKViewer(name),
     auto iren = vtkSmartPointer<vtkGenericRenderWindowInteractor>::New();
 #else
     vtkSmartPointer<vtkXRenderWindowInteractor> iren = vtkSmartPointer<vtkXRenderWindowInteractor>::New();
-    iren->SetInteractorStyle(m_vtkInteractorStyle.get());
+    iren->SetInteractorStyle(m_vtkInteractorStyle.Get());
 #endif
 #endif
     iren->SetInteractorStyle(m_vtkInteractorStyle);
-- 
GitLab