diff --git a/Source/GeometryMappers/imstkPointToTetMap.h b/Source/GeometryMappers/imstkPointToTetMap.h
index 573d61244f3ba5e470d1b7f6e32454bbc7340a98..6d46f2de23c0b879f4a90615a3e19a80918aaec0 100644
--- a/Source/GeometryMappers/imstkPointToTetMap.h
+++ b/Source/GeometryMappers/imstkPointToTetMap.h
@@ -45,7 +45,7 @@ public:
         std::shared_ptr<Geometry> child);
     ~PointToTetMap() override = default;
 
-    IMSTK_TYPE_NAME(TetraTriangleMap)
+    IMSTK_TYPE_NAME(PointToTetMap)
 
     ///
     /// \brief Compute the tetra-triangle mesh map
diff --git a/Source/GeometryMappers/imstkPointwiseMap.h b/Source/GeometryMappers/imstkPointwiseMap.h
index 1f08dbf33ab25e5de327f47a094313ba5deb5136..f222202c6f6521d21f5f0c7f8ca787cd5fbd3d29 100644
--- a/Source/GeometryMappers/imstkPointwiseMap.h
+++ b/Source/GeometryMappers/imstkPointwiseMap.h
@@ -39,7 +39,7 @@ public:
         std::shared_ptr<Geometry> child);
     ~PointwiseMap() override = default;
 
-    IMSTK_TYPE_NAME(OneToOneMap)
+    IMSTK_TYPE_NAME(PointwiseMap)
 
     ///
     /// \brief Compute the tetra-triangle mesh map
diff --git a/Source/GeometryMappers/imstkTriangleToTetMap.h b/Source/GeometryMappers/imstkTriangleToTetMap.h
index fed5588ce2baf10bca6ad4ad55b7d89f8f72122b..ef2ff9801a6201b0fb28b45f824a0f85e96418d5 100644
--- a/Source/GeometryMappers/imstkTriangleToTetMap.h
+++ b/Source/GeometryMappers/imstkTriangleToTetMap.h
@@ -36,6 +36,8 @@ public:
         std::shared_ptr<Geometry> child);
     ~TriangleToTetMap() override = default;
 
+    IMSTK_TYPE_NAME(TriangleToTetMap)
+
     ///
     /// \brief Compute the map
     ///
diff --git a/Source/Scene/imstkPbdObjectStitching.h b/Source/Scene/imstkPbdObjectStitching.h
index eb176e0fd5cadb33c8a61aeb07689433fb235fde..1dfa1a26508f3dba2a1f047fee5eddd0955ab0de 100644
--- a/Source/Scene/imstkPbdObjectStitching.h
+++ b/Source/Scene/imstkPbdObjectStitching.h
@@ -21,9 +21,10 @@ limitations under the License.
 
 #pragma once
 
-#include "imstkSceneObject.h"
+#include "imstkMacros.h"
 #include "imstkMath.h"
 #include "imstkPbdCollisionConstraint.h"
+#include "imstkSceneObject.h"
 
 #include <unordered_map>
 
@@ -47,7 +48,7 @@ public:
     PbdObjectStitching(std::shared_ptr<PbdObject> obj1);
     ~PbdObjectStitching() override = default;
 
-    const std::string getTypeName() const override { return "PbdObjectStitching"; }
+    IMSTK_TYPE_NAME(PbdObjectStitching)
 
     ///
     /// \brief Set/Get the stiffness, 0-1 value that alters the step size in