diff --git a/include/itkImageToPointSetFilter.h b/include/itkImageToPointSetFilter.h
index 9fd4a10..5c8a866 100644
--- a/include/itkImageToPointSetFilter.h
+++ b/include/itkImageToPointSetFilter.h
@@ -50,7 +50,7 @@ class ITK_TEMPLATE_EXPORT ImageToPointSetFilter: public ImageToMeshFilter< TInpu
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(ImageToPointSetFilter, ImageToMeshFilter);
+  itkOverrideGetNameOfClassMacro(ImageToPointSetFilter);
 
   /** Some convenient type alias. */
   using InputImageType = TInputImage;
@@ -71,10 +71,10 @@ class ITK_TEMPLATE_EXPORT ImageToPointSetFilter: public ImageToMeshFilter< TInpu
   using PointDataContainerIterator = typename PointDataContainer::Iterator;
 
   /** The dimension of the output mesh. */
-  itkStaticConstMacro(PointDimension, unsigned int, TOutputMesh::PointDimension);
+  static constexpr unsigned int PointDimension = TOutputMesh::PointDimension;
 
   /** ImageDimension constant */
-  itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension);
+  static constexpr unsigned int ImageDimension = TInputImage::ImageDimension;
 
 protected:
   ImageToPointSetFilter() {}
diff --git a/include/itkMeshToPolyDataFilter.h b/include/itkMeshToPolyDataFilter.h
index 8e7b4a3..5611fcd 100644
--- a/include/itkMeshToPolyDataFilter.h
+++ b/include/itkMeshToPolyDataFilter.h
@@ -73,7 +73,7 @@ class MeshToPolyDataFilter: public ProcessObject
   using PolyDataType = PolyData< typename InputMeshType::PixelType >;
 
   /** Run-time type information. */
-  itkTypeMacro( MeshToPolyDataFilter, ProcessObject );
+  itkOverrideGetNameOfClassMacro( MeshToPolyDataFilter);
 
   /** Standard New macro. */
   itkNewMacro( Self );
diff --git a/include/itkPolyData.h b/include/itkPolyData.h
index 1a33614..56dee89 100644
--- a/include/itkPolyData.h
+++ b/include/itkPolyData.h
@@ -49,7 +49,7 @@ class ITK_TEMPLATE_EXPORT PolyData: public DataObject
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(PolyData, DataObject);
+  itkOverrideGetNameOfClassMacro(PolyData);
 
   /** Type of PointData or CellData */
   using PixelType = TPixel;
diff --git a/include/itkPolyDataToMeshFilter.h b/include/itkPolyDataToMeshFilter.h
index 637e310..ee06491 100644
--- a/include/itkPolyDataToMeshFilter.h
+++ b/include/itkPolyDataToMeshFilter.h
@@ -51,7 +51,7 @@ class PolyDataToMeshFilter : public ProcessObject
   itkNewMacro(Self);
 
   /** Run-time type information. */
-  itkTypeMacro(PolyDataToMeshFilter, ProcessObject);
+  itkOverrideGetNameOfClassMacro(PolyDataToMeshFilter);
 
   static constexpr unsigned int PointDimension = TInputPolyData::PointDimension;