diff --git a/Modules/Compatibility/Deprecated/include/itkTreeIteratorClone.h b/Modules/Compatibility/Deprecated/include/itkTreeIteratorClone.h
index 20fc820cf7d..6c5b156cd87 100644
--- a/Modules/Compatibility/Deprecated/include/itkTreeIteratorClone.h
+++ b/Modules/Compatibility/Deprecated/include/itkTreeIteratorClone.h
@@ -23,7 +23,7 @@
 
 namespace itk
 {
-/** \class itkTreeIteratorClone
+/** \class TreeIteratorClone
  *  \brief itkTreeIteratorClone class
  *  \ingroup DataRepresentation
  *  \ingroup ITKDeprecated
diff --git a/Modules/Core/Common/include/itkFloatingPointExceptions.h b/Modules/Core/Common/include/itkFloatingPointExceptions.h
index 35f2876ce63..d407803204b 100644
--- a/Modules/Core/Common/include/itkFloatingPointExceptions.h
+++ b/Modules/Core/Common/include/itkFloatingPointExceptions.h
@@ -43,7 +43,7 @@ class FloatingPointExceptionsEnums
 extern ITKCommon_EXPORT std::ostream &
                         operator<<(std::ostream & out, const FloatingPointExceptionsEnums::ExceptionAction value);
 
-/** \class itkFloatingPointExceptions
+/** \class FloatingPointExceptions
  *  \brief Allows floating point exceptions to be caught during program execution.
  *
  * Allows floating point exceptions to be caught during program execution.
diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshScalarDataVTKPolyDataWriter.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshScalarDataVTKPolyDataWriter.h
index 8f07d992940..e6a190393c9 100644
--- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshScalarDataVTKPolyDataWriter.h
+++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshScalarDataVTKPolyDataWriter.h
@@ -24,7 +24,7 @@
 namespace itk
 {
 /**
- * \class QuadEdgeMeshScalarDataVTKPolyData
+ * \class QuadEdgeMeshScalarDataVTKPolyDataWriter
  *
  * \brief This class saves a QuadMesh into a VTK-legacy file format,
  *        including its scalar data associated with points.
diff --git a/Modules/Core/Transform/include/itkTransformBase.h b/Modules/Core/Transform/include/itkTransformBase.h
index 01fb6fd31bd..a93c17158ad 100644
--- a/Modules/Core/Transform/include/itkTransformBase.h
+++ b/Modules/Core/Transform/include/itkTransformBase.h
@@ -55,7 +55,7 @@ class TransformBaseTemplateEnums
 // Define how to print enumeration
 extern ITKTransform_EXPORT std::ostream &
                            operator<<(std::ostream & out, const TransformBaseTemplateEnums::TransformCategory value);
-/** \class itkTransformBaseTemplate
+/** \class TransformBaseTemplate
  *
  * This class is an abstract class to represent a spatial transform.
  *
diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineCenteredL2ResampleImageFilterBase.h b/Modules/Filtering/ImageGrid/include/itkBSplineCenteredL2ResampleImageFilterBase.h
index 5194d099c5f..3844269e082 100644
--- a/Modules/Filtering/ImageGrid/include/itkBSplineCenteredL2ResampleImageFilterBase.h
+++ b/Modules/Filtering/ImageGrid/include/itkBSplineCenteredL2ResampleImageFilterBase.h
@@ -33,7 +33,7 @@
 
 namespace itk
 {
-/** \class itkBSplineCenteredL2ResampleImageFilterBase
+/** \class BSplineCenteredL2ResampleImageFilterBase
  * \brief Uses the "Centered L2" B-Spline pyramid implementation of B-Spline Filters
  *        to up/down sample an image by a factor of 2.
  *
diff --git a/Modules/Numerics/FEM/include/itkFEMLoadNoisyLandmark.h b/Modules/Numerics/FEM/include/itkFEMLoadNoisyLandmark.h
index 0db4535128c..eb73d67c099 100644
--- a/Modules/Numerics/FEM/include/itkFEMLoadNoisyLandmark.h
+++ b/Modules/Numerics/FEM/include/itkFEMLoadNoisyLandmark.h
@@ -27,7 +27,7 @@ namespace itk
 namespace fem
 {
 /**
- * \class itkFEMLoadNoisyLandmark
+ * \class FEMLoadNoisyLandmark
  * \brief This landmark is derived from the motion of a specific landmark, but
  * allows the existence of noise or outliers
  *