From 7a5663e7681b1d34783adac780116c173f52eef5 Mon Sep 17 00:00:00 2001
From: Niels Dekker <N.Dekker@lumc.nl>
Date: Wed, 4 Dec 2024 12:15:19 +0100
Subject: [PATCH] COMP: Slow down removal of the `CoordRepType` aliases

For now, only remove those aliases when explicitly requested by defining
`ITK_REMOVE_COORD_REP_TYPES`. The aim is to put them in
`#ifndef ITK_FUTURE_LEGACY_REMOVE` with ITK 6.1.
---
 Modules/Core/Common/include/itkBoundingBox.h       |  2 +-
 Modules/Core/Common/include/itkCellInterface.h     |  4 ++--
 Modules/Core/Common/include/itkContinuousIndex.h   |  2 +-
 .../Common/include/itkDefaultDynamicMeshTraits.h   |  2 +-
 .../Common/include/itkDefaultStaticMeshTraits.h    |  2 +-
 Modules/Core/Common/include/itkPoint.h             |  2 +-
 Modules/Core/Common/include/itkPointSetBase.h      |  2 +-
 Modules/Core/Common/include/itkTriangleHelper.h    |  2 +-
 .../Core/ImageFunction/include/itkImageFunction.h  |  2 +-
 .../include/itkVectorInterpolateImageFunction.h    |  2 +-
 .../Mesh/include/itkInteriorExteriorMeshFilter.h   |  2 +-
 Modules/Core/Mesh/include/itkMesh.h                |  2 +-
 .../itkParametricSpaceToImageSpaceMeshFilter.h     |  2 +-
 Modules/Core/Mesh/include/itkTransformMeshFilter.h |  2 +-
 Modules/Core/Mesh/include/itkWarpMeshFilter.h      |  2 +-
 .../include/itkQuadEdgeCellTraitsInfo.h            |  2 +-
 ...geMeshEulerOperatorCreateCenterVertexFunction.h |  2 +-
 .../include/itkQuadEdgeMeshExtendedTraits.h        |  2 +-
 .../include/itkQuadEdgeMeshFrontIterator.h         |  2 +-
 .../include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h  |  4 ++--
 .../QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h   |  2 +-
 .../include/itkBSplineTransformInitializer.h       |  2 +-
 .../include/itkBSplineControlPointImageFunction.h  |  2 +-
 .../ImageGrid/include/itkExpandImageFilter.h       |  2 +-
 .../ImageGrid/include/itkWarpImageFilter.h         |  2 +-
 .../ImageGrid/include/itkWarpVectorImageFilter.h   |  2 +-
 .../include/itkVectorExpandImageFilter.h           |  2 +-
 .../include/itkBorderQuadEdgeMeshFilter.h          |  4 ++--
 .../itkDelaunayConformingQuadEdgeMeshFilter.h      |  4 ++--
 .../itkParameterizationQuadEdgeMeshFilter.h        |  4 ++--
 .../itkQuadEdgeMeshParamMatrixCoefficients.h       | 14 +++++++-------
 Modules/IO/MeshBase/include/itkMeshFileReader.h    |  2 +-
 .../include/itkConformalFlatteningMeshFilter.h     |  2 +-
 .../itkMultiphaseFiniteDifferenceImageFilter.h     |  2 +-
 .../include/itkMeanSquareRegistrationFunction.h    |  2 +-
 .../FEM/include/itkFEMRegistrationFilter.h         |  2 +-
 .../FEM/include/itkMIRegistrationFunction.h        |  2 +-
 .../FEM/include/itkNCCRegistrationFunction.h       |  2 +-
 .../include/itkGPUDemonsRegistrationFunction.h     |  2 +-
 .../itkManifoldParzenWindowsPointSetFunction.h     |  2 +-
 .../Metricsv4/include/itkPointSetFunction.h        |  2 +-
 .../itkPointSetToPointSetMetricWithIndexv4.h       |  2 +-
 .../include/itkPointSetToPointSetMetricv4.h        |  2 +-
 .../include/itkDemonsRegistrationFunction.h        |  2 +-
 .../include/itkESMDemonsRegistrationFunction.h     |  2 +-
 ...FastSymmetricForcesDemonsRegistrationFunction.h |  2 +-
 .../itkLevelSetMotionRegistrationFunction.h        |  2 +-
 .../itkSymmetricForcesDemonsRegistrationFunction.h |  2 +-
 .../include/itkShapeSignedDistanceFunction.h       |  2 +-
 .../Voronoi/include/itkVoronoiDiagram2D.h          |  2 +-
 .../Voronoi/include/itkVoronoiDiagram2DGenerator.h |  2 +-
 51 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/Modules/Core/Common/include/itkBoundingBox.h b/Modules/Core/Common/include/itkBoundingBox.h
index ffcffc93200..86a3fbbcbfd 100644
--- a/Modules/Core/Common/include/itkBoundingBox.h
+++ b/Modules/Core/Common/include/itkBoundingBox.h
@@ -90,7 +90,7 @@ class ITK_TEMPLATE_EXPORT BoundingBox : public Object
   /** Hold on to the type information specified by the template parameters. */
   using PointIdentifier = TPointIdentifier;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Common/include/itkCellInterface.h b/Modules/Core/Common/include/itkCellInterface.h
index cf5e15318a3..08515c15bb7 100644
--- a/Modules/Core/Common/include/itkCellInterface.h
+++ b/Modules/Core/Common/include/itkCellInterface.h
@@ -110,7 +110,7 @@ class ITK_TEMPLATE_EXPORT CellInterface
 
   /** Save type information for this cell. */
   using CoordinateType = typename CellTraits::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
@@ -530,7 +530,7 @@ class ITK_TEMPLATE_EXPORT CellTraitsInfo
 public:
   static constexpr unsigned int PointDimension = VPointDimension;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Common/include/itkContinuousIndex.h b/Modules/Core/Common/include/itkContinuousIndex.h
index 1028a9d8933..7a30496e63f 100644
--- a/Modules/Core/Common/include/itkContinuousIndex.h
+++ b/Modules/Core/Common/include/itkContinuousIndex.h
@@ -57,7 +57,7 @@ class ITK_TEMPLATE_EXPORT ContinuousIndex : public Point<TCoordinate, VIndexDime
    * as a data element held in an Point.   */
   using ValueType = TCoordinate;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Common/include/itkDefaultDynamicMeshTraits.h b/Modules/Core/Common/include/itkDefaultDynamicMeshTraits.h
index 8fb978f9f2b..d6f798dd5e5 100644
--- a/Modules/Core/Common/include/itkDefaultDynamicMeshTraits.h
+++ b/Modules/Core/Common/include/itkDefaultDynamicMeshTraits.h
@@ -70,7 +70,7 @@ class DefaultDynamicMeshTraits
   using PixelType = TPixelType;
   using CellPixelType = TCellPixelType;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Common/include/itkDefaultStaticMeshTraits.h b/Modules/Core/Common/include/itkDefaultStaticMeshTraits.h
index ea424d2394c..f79b4acc830 100644
--- a/Modules/Core/Common/include/itkDefaultStaticMeshTraits.h
+++ b/Modules/Core/Common/include/itkDefaultStaticMeshTraits.h
@@ -68,7 +68,7 @@ class ITK_TEMPLATE_EXPORT DefaultStaticMeshTraits
   using PixelType = TPixelType;
   using CellPixelType = TCellPixelType;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Common/include/itkPoint.h b/Modules/Core/Common/include/itkPoint.h
index 1be14f403e5..520b3cb7f65 100644
--- a/Modules/Core/Common/include/itkPoint.h
+++ b/Modules/Core/Common/include/itkPoint.h
@@ -61,7 +61,7 @@ class ITK_TEMPLATE_EXPORT Point : public FixedArray<TCoordinate, VPointDimension
    * as a data element held in an Point.   */
   using ValueType = TCoordinate;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Common/include/itkPointSetBase.h b/Modules/Core/Common/include/itkPointSetBase.h
index 287427171d2..0a42b33be1b 100644
--- a/Modules/Core/Common/include/itkPointSetBase.h
+++ b/Modules/Core/Common/include/itkPointSetBase.h
@@ -72,7 +72,7 @@ class ITK_TEMPLATE_EXPORT PointSetBase : public DataObject
   /** Convenient type alias obtained from TPointsContainer template parameter. */
   using PointType = typename TPointsContainer::Element;
   using CoordinateType = typename PointType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Common/include/itkTriangleHelper.h b/Modules/Core/Common/include/itkTriangleHelper.h
index b2995424bdd..698f33ba917 100644
--- a/Modules/Core/Common/include/itkTriangleHelper.h
+++ b/Modules/Core/Common/include/itkTriangleHelper.h
@@ -34,7 +34,7 @@ class ITK_TEMPLATE_EXPORT TriangleHelper
   using Self = TriangleHelper;
   using PointType = TPoint;
   using CoordinateType = typename PointType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/ImageFunction/include/itkImageFunction.h b/Modules/Core/ImageFunction/include/itkImageFunction.h
index b24f8ec114a..42af84c8928 100644
--- a/Modules/Core/ImageFunction/include/itkImageFunction.h
+++ b/Modules/Core/ImageFunction/include/itkImageFunction.h
@@ -85,7 +85,7 @@ class ITK_TEMPLATE_EXPORT ImageFunction : public FunctionBase<Point<TCoordinate,
 
   /** CoordinateType type alias support */
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/ImageFunction/include/itkVectorInterpolateImageFunction.h b/Modules/Core/ImageFunction/include/itkVectorInterpolateImageFunction.h
index 75241ddaf30..6bb8cbdab88 100644
--- a/Modules/Core/ImageFunction/include/itkVectorInterpolateImageFunction.h
+++ b/Modules/Core/ImageFunction/include/itkVectorInterpolateImageFunction.h
@@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT VectorInterpolateImageFunction
 
   /** CoordRep type alias support */
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Mesh/include/itkInteriorExteriorMeshFilter.h b/Modules/Core/Mesh/include/itkInteriorExteriorMeshFilter.h
index a68199c1ab5..1b3764a6188 100644
--- a/Modules/Core/Mesh/include/itkInteriorExteriorMeshFilter.h
+++ b/Modules/Core/Mesh/include/itkInteriorExteriorMeshFilter.h
@@ -63,7 +63,7 @@ class ITK_TEMPLATE_EXPORT InteriorExteriorMeshFilter : public MeshToMeshFilter<T
 
   /** Type for representing coordinates. */
   using CoordinateType = typename TInputMesh::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Mesh/include/itkMesh.h b/Modules/Core/Mesh/include/itkMesh.h
index 1317e8f1f1a..79da37868e1 100644
--- a/Modules/Core/Mesh/include/itkMesh.h
+++ b/Modules/Core/Mesh/include/itkMesh.h
@@ -169,7 +169,7 @@ class ITK_TEMPLATE_EXPORT Mesh : public PointSet<TPixelType, VDimension, TMeshTr
 
   /** Convenient type alias obtained from TMeshTraits template parameter. */
   using CoordinateType = typename MeshTraits::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Mesh/include/itkParametricSpaceToImageSpaceMeshFilter.h b/Modules/Core/Mesh/include/itkParametricSpaceToImageSpaceMeshFilter.h
index 3e11eed57a9..0f816f48836 100644
--- a/Modules/Core/Mesh/include/itkParametricSpaceToImageSpaceMeshFilter.h
+++ b/Modules/Core/Mesh/include/itkParametricSpaceToImageSpaceMeshFilter.h
@@ -57,7 +57,7 @@ class ITK_TEMPLATE_EXPORT ParametricSpaceToImageSpaceMeshFilter : public MeshToM
 
   /** Type for representing coordinates. */
   using CoordinateType = typename TInputMesh::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Mesh/include/itkTransformMeshFilter.h b/Modules/Core/Mesh/include/itkTransformMeshFilter.h
index 0b18a1667ef..c0704a82832 100644
--- a/Modules/Core/Mesh/include/itkTransformMeshFilter.h
+++ b/Modules/Core/Mesh/include/itkTransformMeshFilter.h
@@ -57,7 +57,7 @@ class ITK_TEMPLATE_EXPORT TransformMeshFilter : public MeshToMeshFilter<TInputMe
 
   /** Type for representing coordinates. */
   using CoordinateType = typename TInputMesh::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Mesh/include/itkWarpMeshFilter.h b/Modules/Core/Mesh/include/itkWarpMeshFilter.h
index e4e04ddfd4c..3f2986a5ca6 100644
--- a/Modules/Core/Mesh/include/itkWarpMeshFilter.h
+++ b/Modules/Core/Mesh/include/itkWarpMeshFilter.h
@@ -58,7 +58,7 @@ class ITK_TEMPLATE_EXPORT WarpMeshFilter : public MeshToMeshFilter<TInputMesh, T
 
   /** Type for representing coordinates. */
   using CoordinateType = typename TInputMesh::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeCellTraitsInfo.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeCellTraitsInfo.h
index b1a59c50885..3c151acaab9 100644
--- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeCellTraitsInfo.h
+++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeCellTraitsInfo.h
@@ -51,7 +51,7 @@ class QuadEdgeMeshCellTraitsInfo
 public:
   static constexpr unsigned int PointDimension = VPointDimension;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshEulerOperatorCreateCenterVertexFunction.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshEulerOperatorCreateCenterVertexFunction.h
index 94fd274c849..39dc17ccaf0 100644
--- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshEulerOperatorCreateCenterVertexFunction.h
+++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshEulerOperatorCreateCenterVertexFunction.h
@@ -55,7 +55,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshEulerOperatorCreateCenterVertexFunction
   using PointIdentifier = typename MeshType::PointIdentifier;
   using PointType = typename MeshType::PointType;
   using CoordinateType = typename MeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h
index ac8707b9a66..7816ce76718 100644
--- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h
+++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h
@@ -71,7 +71,7 @@ class QuadEdgeMeshExtendedTraits
   using Self = QuadEdgeMeshExtendedTraits;
   /** Save the template parameters. */
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h
index 1cae9743cf4..c168f43ccd2 100644
--- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h
+++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h
@@ -85,7 +85,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshFrontBaseIterator
 protected:
   // Mesh types
   using CoordinateType = typename MeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h
index 3a89efdf7e3..f9663e4c5d0 100644
--- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h
+++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h
@@ -50,7 +50,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshToQuadEdgeMeshFilter : public MeshToMeshFi
   using InputMeshPointer = typename InputMeshType::Pointer;
   using InputMeshConstPointer = typename InputMeshType::ConstPointer;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -81,7 +81,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshToQuadEdgeMeshFilter : public MeshToMeshFi
   using OutputMeshPointer = typename OutputMeshType::Pointer;
   using OutputMeshConstPointer = typename OutputMeshType::ConstPointer;
   using OutputCoordinateType = typename OutputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using OutputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
 #endif
diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h
index d38b0d3aa0d..ff0b6d4cbaf 100644
--- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h
+++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h
@@ -54,7 +54,7 @@ class QuadEdgeMeshTraits
   using PixelType = TPixel;
   using CellPixelType = TPixel;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Core/Transform/include/itkBSplineTransformInitializer.h b/Modules/Core/Transform/include/itkBSplineTransformInitializer.h
index f0e8eb122d0..23ccb857046 100644
--- a/Modules/Core/Transform/include/itkBSplineTransformInitializer.h
+++ b/Modules/Core/Transform/include/itkBSplineTransformInitializer.h
@@ -64,7 +64,7 @@ class ITK_TEMPLATE_EXPORT BSplineTransformInitializer : public Object
   using IndexType = typename ImageType::IndexType;
   using ImagePointType = typename ImageType::PointType;
   using ImagePointCoordinateType = typename ImagePointType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using ImagePointCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `ImagePointCoordRepType`. Please use `ImagePointCoordinateType` instead!") =
     ImagePointCoordinateType;
diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h
index a2a2854506c..8a3784f1602 100644
--- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h
+++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h
@@ -79,7 +79,7 @@ class ITK_TEMPLATE_EXPORT BSplineControlPointImageFunction
   using ControlPointLatticeType = TInputImage;
   using InputImageType = TInputImage;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h b/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h
index d4e15e2f89b..cccf600b834 100644
--- a/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h
+++ b/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h
@@ -93,7 +93,7 @@ class ITK_TEMPLATE_EXPORT ExpandImageFilter : public ImageToImageFilter<TInputIm
 
   /** Typedef support for the interpolation function. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h
index eb179b7e2d1..0a5c7b8a74c 100644
--- a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h
+++ b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h
@@ -129,7 +129,7 @@ class ITK_TEMPLATE_EXPORT WarpImageFilter : public ImageToImageFilter<TInputImag
 
   /** Interpolator type alias support */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h
index 1f70717528c..f8c530322e6 100644
--- a/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h
+++ b/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h
@@ -132,7 +132,7 @@ class ITK_TEMPLATE_EXPORT WarpVectorImageFilter : public ImageToImageFilter<TInp
 
   /** Interpolator type alias support */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h
index e82cb4c862b..27ae56be74b 100644
--- a/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h
+++ b/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h
@@ -118,7 +118,7 @@ class ITK_TEMPLATE_EXPORT VectorExpandImageFilter : public ImageToImageFilter<TI
 
   /** Typedef support for the interpolation function */
   using CoordinateType = double;
-#  ifndef ITK_FUTURE_LEGACY_REMOVE
+#  ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #  endif
diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h
index 2c02f9036e4..c310c43cadb 100644
--- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h
+++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h
@@ -93,7 +93,7 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd
   using InputMeshType = TInputMesh;
   using InputMeshConstPointer = typename InputMeshType::ConstPointer;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -116,7 +116,7 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd
   using OutputMeshType = TOutputMesh;
   using OutputMeshPointer = typename OutputMeshType::Pointer;
   using OutputCoordinateType = typename OutputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using OutputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
 #endif
diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h
index 1c5818fa342..8520169ede6 100644
--- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h
+++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h
@@ -50,7 +50,7 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter
   using InputMeshType = TInputMesh;
   using InputMeshPointer = typename InputMeshType::Pointer;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -78,7 +78,7 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter
   using OutputMeshType = TOutputMesh;
   using OutputMeshPointer = typename OutputMeshType::Pointer;
   using OutputCoordinateType = typename OutputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using OutputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
 #endif
diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h
index 779df453d62..417e4206e38 100644
--- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h
+++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h
@@ -70,7 +70,7 @@ class ITK_TEMPLATE_EXPORT ParameterizationQuadEdgeMeshFilter
   using InputMeshPointer = typename InputMeshType::Pointer;
   using InputMeshConstPointer = typename InputMeshType::ConstPointer;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -103,7 +103,7 @@ class ITK_TEMPLATE_EXPORT ParameterizationQuadEdgeMeshFilter
   using OutputMeshPointer = typename OutputMeshType::Pointer;
   using OutputMeshConstPointer = typename OutputMeshType::ConstPointer;
   using OutputCoordinateType = typename OutputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using OutputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
 #endif
diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h
index c276db145dc..fddf98e6213 100644
--- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h
+++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h
@@ -35,7 +35,7 @@ class MatrixCoefficients
 public:
   using InputMeshType = TInputMesh;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -63,7 +63,7 @@ class ITK_TEMPLATE_EXPORT OnesMatrixCoefficients : public MatrixCoefficients<TIn
 
   using InputMeshType = TInputMesh;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -96,7 +96,7 @@ class ITK_TEMPLATE_EXPORT InverseEuclideanDistanceMatrixCoefficients : public Ma
 
   using InputMeshType = TInputMesh;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -142,7 +142,7 @@ class ITK_TEMPLATE_EXPORT ConformalMatrixCoefficients : public MatrixCoefficient
 
   using InputMeshType = TInputMesh;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -200,7 +200,7 @@ class ITK_TEMPLATE_EXPORT AuthalicMatrixCoefficients : public MatrixCoefficients
 
   using InputMeshType = TInputMesh;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -260,7 +260,7 @@ class ITK_TEMPLATE_EXPORT IntrinsicMatrixCoefficients : public MatrixCoefficient
 
   using InputMeshType = TInputMesh;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
@@ -299,7 +299,7 @@ class ITK_TEMPLATE_EXPORT HarmonicMatrixCoefficients : public MatrixCoefficients
 
   using InputMeshType = TInputMesh;
   using InputCoordinateType = typename InputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
diff --git a/Modules/IO/MeshBase/include/itkMeshFileReader.h b/Modules/IO/MeshBase/include/itkMeshFileReader.h
index 4b26ca7af9d..7543cee1a03 100644
--- a/Modules/IO/MeshBase/include/itkMeshFileReader.h
+++ b/Modules/IO/MeshBase/include/itkMeshFileReader.h
@@ -98,7 +98,7 @@ class ITK_TEMPLATE_EXPORT MeshFileReader : public MeshSource<TOutputMesh>
   /** Define output mesh types */
   using OutputMeshType = TOutputMesh;
   using OutputCoordinateType = typename OutputMeshType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using OutputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
 #endif
diff --git a/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h b/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h
index d5143e7713c..5b0dc3b1cb2 100644
--- a/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h
+++ b/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h
@@ -68,7 +68,7 @@ class ITK_TEMPLATE_EXPORT ConformalFlatteningMeshFilter : public MeshToMeshFilte
   /** Type for representing coordinates. */
   // using CoordinateType = typename TInputMesh::CoordinateType;
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h b/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h
index 43fb46d82b2..698af3f8796 100644
--- a/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h
+++ b/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h
@@ -181,7 +181,7 @@ class ITK_TEMPLATE_EXPORT MultiphaseFiniteDifferenceImageFilter : public InPlace
   using InputImagePointer = typename InputImageType::Pointer;
   using InputPointType = typename InputImageType::PointType;
   using InputCoordinateType = typename InputPointType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using InputCoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
 #endif
diff --git a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h
index 217fcedf5d8..a449c9f1b15 100644
--- a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h
+++ b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h
@@ -96,7 +96,7 @@ class ITK_TEMPLATE_EXPORT MeanSquareRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h
index 205d0b28515..2e4378a25e4 100644
--- a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h
+++ b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h
@@ -191,7 +191,7 @@ class ITK_TEMPLATE_EXPORT FEMRegistrationFilter : public ImageToImageFilter<TMov
 
   /** Typedef support for the interpolation function */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/FEM/include/itkMIRegistrationFunction.h b/Modules/Registration/FEM/include/itkMIRegistrationFunction.h
index 57e27fcaf07..581a7edea91 100644
--- a/Modules/Registration/FEM/include/itkMIRegistrationFunction.h
+++ b/Modules/Registration/FEM/include/itkMIRegistrationFunction.h
@@ -95,7 +95,7 @@ class ITK_TEMPLATE_EXPORT MIRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h b/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h
index 88631be5c80..883fe4c0b1c 100644
--- a/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h
+++ b/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h
@@ -96,7 +96,7 @@ class ITK_TEMPLATE_EXPORT NCCRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
index d23b24b55fb..8438d7fcbc1 100644
--- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
+++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
@@ -99,7 +99,7 @@ class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h b/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h
index 27c44918c25..1dbd23d32d3 100644
--- a/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h
+++ b/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h
@@ -73,7 +73,7 @@ class ITK_TEMPLATE_EXPORT ManifoldParzenWindowsPointSetFunction
   using RealType = TOutput;
   using OutputType = TOutput;
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/Metricsv4/include/itkPointSetFunction.h b/Modules/Registration/Metricsv4/include/itkPointSetFunction.h
index 56f408cfd05..f88d5ab4309 100644
--- a/Modules/Registration/Metricsv4/include/itkPointSetFunction.h
+++ b/Modules/Registration/Metricsv4/include/itkPointSetFunction.h
@@ -85,7 +85,7 @@ class ITK_TEMPLATE_EXPORT PointSetFunction : public FunctionBase<typename TInput
 
   /** CoordinateType type alias support */
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h
index ac807aa4c7b..5c1de8d4f74 100644
--- a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h
+++ b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h
@@ -152,7 +152,7 @@ class ITK_TEMPLATE_EXPORT PointSetToPointSetMetricWithIndexv4
   using PointType = FixedPointType;
   using PixelType = FixedPixelType;
   using CoordinateType = typename PointType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h
index 23498ce78d7..6db191fdb14 100644
--- a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h
+++ b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h
@@ -141,7 +141,7 @@ class ITK_TEMPLATE_EXPORT PointSetToPointSetMetricv4
   using typename Superclass::PointType;
   using typename Superclass::PixelType;
   using CoordinateType = typename PointType::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/PDEDeformable/include/itkDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkDemonsRegistrationFunction.h
index ba431e53707..4fe56f77d0a 100644
--- a/Modules/Registration/PDEDeformable/include/itkDemonsRegistrationFunction.h
+++ b/Modules/Registration/PDEDeformable/include/itkDemonsRegistrationFunction.h
@@ -96,7 +96,7 @@ class ITK_TEMPLATE_EXPORT DemonsRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h
index f970655f57b..637172c432c 100644
--- a/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h
+++ b/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h
@@ -129,7 +129,7 @@ class ITK_TEMPLATE_EXPORT ESMDemonsRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h
index 7f52ffe6872..79eebf79371 100644
--- a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h
+++ b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h
@@ -89,7 +89,7 @@ class ITK_TEMPLATE_EXPORT FastSymmetricForcesDemonsRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h
index 45da10f83d8..167f7e3b360 100644
--- a/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h
+++ b/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h
@@ -99,7 +99,7 @@ class ITK_TEMPLATE_EXPORT LevelSetMotionRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h
index 4dc10fbcb53..79e2f917006 100644
--- a/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h
+++ b/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h
@@ -104,7 +104,7 @@ class ITK_TEMPLATE_EXPORT SymmetricForcesDemonsRegistrationFunction
 
   /** Interpolator type. */
   using CoordinateType = double;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h b/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h
index 077f4285385..27259149d44 100644
--- a/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h
+++ b/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h
@@ -77,7 +77,7 @@ class ITK_TEMPLATE_EXPORT ShapeSignedDistanceFunction
 
   /** CoordRep type alias support */
   using CoordinateType = TCoordinate;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h
index 617eecf7a82..fd96e1f0dd9 100644
--- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h
+++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h
@@ -76,7 +76,7 @@ class ITK_TEMPLATE_EXPORT VoronoiDiagram2D
   /** Typedefs from itkMesh */
   using PixelType = typename MeshTraits::PixelType;
   using CoordinateType = typename MeshTraits::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif
diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h
index 3dfe448e9f3..affe8c2f5b3 100644
--- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h
+++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h
@@ -73,7 +73,7 @@ class ITK_TEMPLATE_EXPORT VoronoiDiagram2DGenerator : public MeshSource<VoronoiD
   using EdgeInfo = typename VDMesh::EdgeInfo;
   using EdgeInfoDQ = typename VDMesh::EdgeInfoDQ;
   using CoordinateType = typename VDMesh::CoordinateType;
-#ifndef ITK_FUTURE_LEGACY_REMOVE
+#ifndef ITK_REMOVE_COORD_REP_TYPES
   using CoordRepType ITK_FUTURE_DEPRECATED(
     "ITK 6 discourages using `CoordRepType`. Please use `CoordinateType` instead!") = CoordinateType;
 #endif