diff --git a/Source/CollisionDetection/CollisionDetection/imstkCollisionDetectionAlgorithm.cpp b/Source/CollisionDetection/CollisionDetection/imstkCollisionDetectionAlgorithm.cpp
index 253989856182723ef29fc8e52d0e9b6700d2f209..dc53c4c017d20c095aa3959a7f27af59d5e8dd31 100644
--- a/Source/CollisionDetection/CollisionDetection/imstkCollisionDetectionAlgorithm.cpp
+++ b/Source/CollisionDetection/CollisionDetection/imstkCollisionDetectionAlgorithm.cpp
@@ -29,7 +29,7 @@ namespace imstk
 CollisionDetectionAlgorithm::CollisionDetectionAlgorithm() : GeometryAlgorithm(),
     m_colData(std::make_shared<CollisionData>())
 {
-    setNumberOfInputPorts(2);
+    setNumInputPorts(2);
 }
 
 bool
diff --git a/Source/Filtering/imstkAppendMesh.cpp b/Source/Filtering/imstkAppendMesh.cpp
index 94a6a2c8835a5e7a3066bf2baa58b4f6c8215eba..0408e581a0f869867b2275211d4dd563f8acca5c 100644
--- a/Source/Filtering/imstkAppendMesh.cpp
+++ b/Source/Filtering/imstkAppendMesh.cpp
@@ -30,15 +30,15 @@ namespace imstk
 {
 AppendMesh::AppendMesh()
 {
-    setNumberOfInputPorts(1);
-    setNumberOfOutputPorts(1);
+    setNumInputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<SurfaceMesh>());
 }
 
 void
 AppendMesh::addInputMesh(std::shared_ptr<SurfaceMesh> inputMesh)
 {
-    setNumberOfInputPorts(getNumInputPorts() + 1);
+    setNumInputPorts(getNumInputPorts() + 1);
     setInput(inputMesh, getNumInputPorts() - 1);
 }
 
diff --git a/Source/Filtering/imstkCleanMesh.cpp b/Source/Filtering/imstkCleanMesh.cpp
index 55a40d8955c99361617b02807d6404d807f36ead..51d7a037083e9e459dae02d88967141eb9cbfad5 100644
--- a/Source/Filtering/imstkCleanMesh.cpp
+++ b/Source/Filtering/imstkCleanMesh.cpp
@@ -31,10 +31,10 @@ namespace imstk
 {
 CleanMesh::CleanMesh()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<SurfaceMesh>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<SurfaceMesh>());
 }
 
diff --git a/Source/Filtering/imstkExtractEdges.cpp b/Source/Filtering/imstkExtractEdges.cpp
index 01d76e5f6b0d60c72ea28974092ec075f88eb271..f4b4d03954a6e87bda7974684e42ee48e034bfb4 100644
--- a/Source/Filtering/imstkExtractEdges.cpp
+++ b/Source/Filtering/imstkExtractEdges.cpp
@@ -32,10 +32,10 @@ namespace imstk
 {
 ExtractEdges::ExtractEdges()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<SurfaceMesh>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<LineMesh>());
 }
 
diff --git a/Source/Filtering/imstkImageDistanceTransform.cpp b/Source/Filtering/imstkImageDistanceTransform.cpp
index cae9e0fba0646f1eaf77d139741438cb88fb688b..6c22d53f335f7c51d5110e0b045e12941913af8c 100644
--- a/Source/Filtering/imstkImageDistanceTransform.cpp
+++ b/Source/Filtering/imstkImageDistanceTransform.cpp
@@ -34,10 +34,10 @@ namespace imstk
 {
 ImageDistanceTransform::ImageDistanceTransform()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<ImageData>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<ImageData>(), 0);
 }
 
diff --git a/Source/Filtering/imstkImageGradient.cpp b/Source/Filtering/imstkImageGradient.cpp
index 4095e2d1e749f30a0716b623d71dde61b4068aa6..b901ad2bf7fdef5884db75c8619a8f04074796d0 100644
--- a/Source/Filtering/imstkImageGradient.cpp
+++ b/Source/Filtering/imstkImageGradient.cpp
@@ -32,10 +32,10 @@ namespace imstk
 {
 ImageGradient::ImageGradient()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<ImageData>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<PointSet>());
 }
 
diff --git a/Source/Filtering/imstkImageResample.cpp b/Source/Filtering/imstkImageResample.cpp
index ab647500127c83e490e7887d97661d260b169a87..c52a24d4a9929a4d571ebfc3dde9cdc3dda5b398 100644
--- a/Source/Filtering/imstkImageResample.cpp
+++ b/Source/Filtering/imstkImageResample.cpp
@@ -33,10 +33,10 @@ namespace imstk
 {
 ImageResample::ImageResample()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<ImageData>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<ImageData>());
 }
 
diff --git a/Source/Filtering/imstkImageReslice.cpp b/Source/Filtering/imstkImageReslice.cpp
index 97d5a5cdd7a3b31df9aa46918abf362144d6f770..b2c43b9b871d750bbcb73789b5ef82e9751e18a9 100644
--- a/Source/Filtering/imstkImageReslice.cpp
+++ b/Source/Filtering/imstkImageReslice.cpp
@@ -32,10 +32,10 @@ namespace imstk
 {
 ImageReslice::ImageReslice()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<ImageData>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<ImageData>());
 }
 
diff --git a/Source/Filtering/imstkImplicitGeometryToImageData.cpp b/Source/Filtering/imstkImplicitGeometryToImageData.cpp
index 1f8aa74697226e021bfef7cad612dcb9631544d5..f00a64408f3dc75d4a5580296d30a8e7e5f7232f 100644
--- a/Source/Filtering/imstkImplicitGeometryToImageData.cpp
+++ b/Source/Filtering/imstkImplicitGeometryToImageData.cpp
@@ -30,10 +30,10 @@ namespace imstk
 {
 ImplicitGeometryToImageData::ImplicitGeometryToImageData()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<ImplicitGeometry>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<ImageData>());
 }
 
diff --git a/Source/Filtering/imstkLocalMarchingCubes.cpp b/Source/Filtering/imstkLocalMarchingCubes.cpp
index 97bed7704edab9f12b10f0337018427fc64570b6..4edf3897c3a973abe33e217f37bbdd41219a35f0 100644
--- a/Source/Filtering/imstkLocalMarchingCubes.cpp
+++ b/Source/Filtering/imstkLocalMarchingCubes.cpp
@@ -360,10 +360,10 @@ lerp(double val1, double val2, double isovalue, double spacing)
 
 LocalMarchingCubes::LocalMarchingCubes()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<ImageData>(0);
 
-    setNumberOfOutputPorts(0);
+    setNumOutputPorts(0);
 }
 
 std::shared_ptr<SurfaceMesh>
@@ -392,7 +392,7 @@ LocalMarchingCubes::setNumberOfChunks(const Vec3i& numChunks)
 {
     m_chunkCount = numChunks[0] * numChunks[1] * numChunks[2];
     m_numChunks  = numChunks;
-    setNumberOfOutputPorts(m_chunkCount);
+    setNumOutputPorts(m_chunkCount);
     for (size_t i = 0; i < m_chunkCount; i++)
     {
         setOutput(std::make_shared<SurfaceMesh>(), i);
diff --git a/Source/Filtering/imstkQuadricDecimate.cpp b/Source/Filtering/imstkQuadricDecimate.cpp
index bf09650906bd939411624cdcf48d7953b7c10a85..91d2a67041d3e6e0cc0072d7203cb62f2d3b8541 100644
--- a/Source/Filtering/imstkQuadricDecimate.cpp
+++ b/Source/Filtering/imstkQuadricDecimate.cpp
@@ -33,8 +33,8 @@ QuadricDecimate::QuadricDecimate() :
 {
     setRequiredInputType<SurfaceMesh>(0);
 
-    setNumberOfInputPorts(1);
-    setNumberOfOutputPorts(1);
+    setNumInputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<SurfaceMesh>());
 }
 
diff --git a/Source/Filtering/imstkSelectEnclosedPoints.cpp b/Source/Filtering/imstkSelectEnclosedPoints.cpp
index 4d708db960939c50c189f2084e7d043c01fda130..ee5d8ec0f8aa0b518fb4b134a940b92af346dbfa 100644
--- a/Source/Filtering/imstkSelectEnclosedPoints.cpp
+++ b/Source/Filtering/imstkSelectEnclosedPoints.cpp
@@ -32,11 +32,11 @@ namespace imstk
 {
 SelectEnclosedPoints::SelectEnclosedPoints()
 {
-    setNumberOfInputPorts(2);
+    setNumInputPorts(2);
     setRequiredInputType<SurfaceMesh>(0);
     setRequiredInputType<PointSet>(1);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<PointSet>());
 }
 
diff --git a/Source/Filtering/imstkSurfaceMeshCut.cpp b/Source/Filtering/imstkSurfaceMeshCut.cpp
index 03c0b96899756dc2627ac12b74db16192b117fc9..43c229c9c6b3dc6b17f719b44df878ed8749e867 100644
--- a/Source/Filtering/imstkSurfaceMeshCut.cpp
+++ b/Source/Filtering/imstkSurfaceMeshCut.cpp
@@ -32,10 +32,10 @@ namespace imstk
 {
 SurfaceMeshCut::SurfaceMeshCut()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<SurfaceMesh>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<SurfaceMesh>());
 
     m_CutGeometry = std::make_shared<Plane>();
diff --git a/Source/Filtering/imstkSurfaceMeshDistanceTransform.cpp b/Source/Filtering/imstkSurfaceMeshDistanceTransform.cpp
index ec8c954023348ba554b3fac37bdc25a52286a617..ed60837a86547ba443af2190041e58b95ba23448 100644
--- a/Source/Filtering/imstkSurfaceMeshDistanceTransform.cpp
+++ b/Source/Filtering/imstkSurfaceMeshDistanceTransform.cpp
@@ -202,10 +202,10 @@ computeFullDT(std::shared_ptr<ImageData> imageData, std::shared_ptr<SurfaceMesh>
 
 SurfaceMeshDistanceTransform::SurfaceMeshDistanceTransform()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<SurfaceMesh>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<ImageData>(), 0);
 }
 
diff --git a/Source/Filtering/imstkSurfaceMeshFlyingEdges.cpp b/Source/Filtering/imstkSurfaceMeshFlyingEdges.cpp
index 5fd963444deea57583c5d5f1ea1b5daa45ea0576..ed87bf02527df8da988b454370b6b3e2d131a01c 100644
--- a/Source/Filtering/imstkSurfaceMeshFlyingEdges.cpp
+++ b/Source/Filtering/imstkSurfaceMeshFlyingEdges.cpp
@@ -32,10 +32,10 @@ namespace imstk
 {
 SurfaceMeshFlyingEdges::SurfaceMeshFlyingEdges()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<ImageData>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<SurfaceMesh>());
 }
 
diff --git a/Source/Filtering/imstkSurfaceMeshImageMask.cpp b/Source/Filtering/imstkSurfaceMeshImageMask.cpp
index 251cc4e353f77ac9b78168e6aae0fca2c86eb709..400212053c6a27b9a2ed594e8d5ea06913affa55 100644
--- a/Source/Filtering/imstkSurfaceMeshImageMask.cpp
+++ b/Source/Filtering/imstkSurfaceMeshImageMask.cpp
@@ -35,11 +35,11 @@ namespace imstk
 {
 SurfaceMeshImageMask::SurfaceMeshImageMask()
 {
-    setNumberOfInputPorts(2);
+    setNumInputPorts(2);
     setRequiredInputType<SurfaceMesh>(0);
     setOptionalInputType<ImageData>(1);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<ImageData>(), 0);
 }
 
diff --git a/Source/Filtering/imstkSurfaceMeshSmoothen.cpp b/Source/Filtering/imstkSurfaceMeshSmoothen.cpp
index 48d9cafc8261581e388e1d0c368125983897b404..cd8c09781bfabd1b9fcec2e1cb6fa97c7ad4d671 100644
--- a/Source/Filtering/imstkSurfaceMeshSmoothen.cpp
+++ b/Source/Filtering/imstkSurfaceMeshSmoothen.cpp
@@ -30,10 +30,10 @@ namespace imstk
 {
 SurfaceMeshSmoothen::SurfaceMeshSmoothen()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<SurfaceMesh>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<SurfaceMesh>());
 }
 
diff --git a/Source/Filtering/imstkSurfaceMeshSubdivide.cpp b/Source/Filtering/imstkSurfaceMeshSubdivide.cpp
index 393540127bbfcea085de8007ae76602f7f5cb1a6..b95531b345af4eadc69c0d9b0aad1357439762fc 100644
--- a/Source/Filtering/imstkSurfaceMeshSubdivide.cpp
+++ b/Source/Filtering/imstkSurfaceMeshSubdivide.cpp
@@ -32,10 +32,10 @@ namespace imstk
 {
 SurfaceMeshSubdivide::SurfaceMeshSubdivide()
 {
-    setNumberOfInputPorts(1);
+    setNumInputPorts(1);
     setRequiredInputType<SurfaceMesh>(0);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<SurfaceMesh>());
 }
 
diff --git a/Source/Filtering/imstkSurfaceMeshTextureProject.cpp b/Source/Filtering/imstkSurfaceMeshTextureProject.cpp
index 720f2fdc12b2e70746d1b061e9e87ff4ba6ae464..87a73af8692e8bb3a4dd984ae6ece0331040d5c7 100644
--- a/Source/Filtering/imstkSurfaceMeshTextureProject.cpp
+++ b/Source/Filtering/imstkSurfaceMeshTextureProject.cpp
@@ -105,11 +105,11 @@ baryInterpolate(T v1, T v2, T v3, Vec3d uvw)
 
 SurfaceMeshTextureProject::SurfaceMeshTextureProject()
 {
-    setNumberOfInputPorts(2);
+    setNumInputPorts(2);
     setRequiredInputType<SurfaceMesh>(0);
     setRequiredInputType<SurfaceMesh>(1);
 
-    setNumberOfOutputPorts(1);
+    setNumOutputPorts(1);
     setOutput(std::make_shared<SurfaceMesh>(), 0);
 }
 
diff --git a/Source/FilteringCore/Testing/GeometryAlgorithmTest.cpp b/Source/FilteringCore/Testing/GeometryAlgorithmTest.cpp
index 9dbf5c9b00a14669f69c724c234b2532810773d9..b469ce023ecd437b5769b1a2e39cdc25fcb504a6 100644
--- a/Source/FilteringCore/Testing/GeometryAlgorithmTest.cpp
+++ b/Source/FilteringCore/Testing/GeometryAlgorithmTest.cpp
@@ -47,7 +47,7 @@ class EmptyAlgorithm : public MockAlgorithm
 public:
     EmptyAlgorithm()
     {
-        setNumberOfInputPorts(4);
+        setNumInputPorts(4);
     }
 };
 
@@ -56,7 +56,7 @@ class ExpectingAlgorithm : public MockAlgorithm
 public:
     ExpectingAlgorithm()
     {
-        setNumberOfInputPorts(4);
+        setNumInputPorts(4);
         setRequiredInputType<SurfaceMesh>(1);
     }
 };
@@ -66,7 +66,7 @@ class ExpectingOptional : public MockAlgorithm
 public:
     ExpectingOptional()
     {
-        setNumberOfInputPorts(4);
+        setNumInputPorts(4);
         setOptionalInputType<SurfaceMesh>(1);
     }
 };
@@ -76,7 +76,7 @@ class ExpectingAllKinds : public MockAlgorithm
 public:
     ExpectingAllKinds()
     {
-        setNumberOfInputPorts(5);
+        setNumInputPorts(5);
         setRequiredInputType<SurfaceMesh>(1);
         setRequiredInputType<Sphere>(2);
         setOptionalInputType<SurfaceMesh>(3);
diff --git a/Source/FilteringCore/imstkGeometryAlgorithm.cpp b/Source/FilteringCore/imstkGeometryAlgorithm.cpp
index 18750b4cbc7665b62b0329392ad512119a35c25e..5be822d76a2efc2a9585a8dd47ebbb758cb90ae5 100644
--- a/Source/FilteringCore/imstkGeometryAlgorithm.cpp
+++ b/Source/FilteringCore/imstkGeometryAlgorithm.cpp
@@ -47,7 +47,7 @@ GeometryAlgorithm::setOutput(std::shared_ptr<Geometry> outputGeometry, const siz
 }
 
 void
-GeometryAlgorithm::setNumberOfInputPorts(const size_t numPorts)
+GeometryAlgorithm::setNumInputPorts(const size_t numPorts)
 {
     this->m_NumInputPorts = numPorts;
     // Add entries in the map for it
@@ -61,7 +61,7 @@ GeometryAlgorithm::setNumberOfInputPorts(const size_t numPorts)
 }
 
 void
-GeometryAlgorithm::setNumberOfOutputPorts(const size_t numPorts)
+GeometryAlgorithm::setNumOutputPorts(const size_t numPorts)
 {
     this->m_NumOutputPorts = numPorts;
     // Add entries in the map for it
diff --git a/Source/FilteringCore/imstkGeometryAlgorithm.h b/Source/FilteringCore/imstkGeometryAlgorithm.h
index 4aa52b37eb944e85f0af91b4ce6426ac1276d8e5..59b9edcbf52e60003350f4f05b5dcc4deb06422c 100644
--- a/Source/FilteringCore/imstkGeometryAlgorithm.h
+++ b/Source/FilteringCore/imstkGeometryAlgorithm.h
@@ -107,12 +107,12 @@ protected:
     ///
     /// \brief Sets the amount of input ports
     ///
-    void setNumberOfInputPorts(const size_t numPorts);
+    void setNumInputPorts(const size_t numPorts);
 
     ///
     /// \brief Sets the amount of output ports
     ///
-    void setNumberOfOutputPorts(const size_t numPorts);
+    void setNumOutputPorts(const size_t numPorts);
 
     ///
     /// \brief Declares the type for the port with the given number, also defines that