diff --git a/SoftwareGuide/Cover/Source/ModelBasedSegmentation.cxx b/SoftwareGuide/Cover/Source/ModelBasedSegmentation.cxx
index 3aa4a64d..16d0494b 100644
--- a/SoftwareGuide/Cover/Source/ModelBasedSegmentation.cxx
+++ b/SoftwareGuide/Cover/Source/ModelBasedSegmentation.cxx
@@ -39,7 +39,7 @@ class IterationCallback : public itk::Command
   using Pointer = itk::SmartPointer<Self>;
   using ConstPointer = itk::SmartPointer<const Self>;
 
-  itkTypeMacro(IterationCallback, Superclass);
+   itkOverrideGetNameOfClassMacro(IterationCallback);
   itkNewMacro(Self);
 
   /** Type defining the optimizer */
@@ -118,7 +118,7 @@ class SimpleImageToSpatialObjectMetric : public itk::ImageToSpatialObjectMetric<
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(SimpleImageToSpatialObjectMetric, ImageToSpatialObjectMetric);
+   itkOverrideGetNameOfClassMacro(SimpleImageToSpatialObjectMetric);
 
   enum
   {
diff --git a/SoftwareGuide/Latex/Appendices/CodingStyleGuide.tex b/SoftwareGuide/Latex/Appendices/CodingStyleGuide.tex
index e332f43a..92bac7b2 100644
--- a/SoftwareGuide/Latex/Appendices/CodingStyleGuide.tex
+++ b/SoftwareGuide/Latex/Appendices/CodingStyleGuide.tex
@@ -2109,7 +2109,7 @@ \subsection{Indentation and Tabs}
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(SpecializedFilter, ImageToImageFilter);
+   itkOverrideGetNameOfClassMacro(SpecializedFilter);
 
   ...
 };
@@ -2228,7 +2228,7 @@ \subsection{White Spaces}
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(SpecializedFilter, ImageToImageFilter);
+   itkOverrideGetNameOfClassMacro(SpecializedFilter);
 
   // ...
 };
@@ -3228,9 +3228,8 @@ \section{Using Standard Macros}
 \item \code{itkNewMacro(T)}: Creates the static class method \code{New()}
 that interacts with the object factory to instantiate objects. The method
 returns a \code{SmartPointer<T>} properly reference counted.
-\item \code{itkTypeMacro(thisClass, superclass)}: Adds standard methods a
-class, mainly type information. Adds the \code{GetNameOfClass()} method to the
-class.
+\item \code{itkOverrideGetNameOfClassMacro(thisClass)}: Adds an override of
+the \code{GetNameOfClass()} method to the class.
 \item \code{ITK\_DISALLOW\_COPY\_AND\_ASSIGN(TypeName)}: Disallow copying by
 declaring copy constructor and assignment operator deleted. This must be
 declared in the \textbf{public} section.
@@ -3297,7 +3296,7 @@ \section{Using Standard Macros}
 itkNewMacro(Self);
 
 /** Run-time type information (and related methods). */
-itkTypeMacro(Image, ImageBase);
+itkOverrideGetNameOfClassMacro(Image);
 \end{minted}
 \normalsize
 
diff --git a/SoftwareGuide/Latex/DevelopmentGuidelines/WriteAFilter.tex b/SoftwareGuide/Latex/DevelopmentGuidelines/WriteAFilter.tex
index c6c59341..121d5221 100644
--- a/SoftwareGuide/Latex/DevelopmentGuidelines/WriteAFilter.tex
+++ b/SoftwareGuide/Latex/DevelopmentGuidelines/WriteAFilter.tex
@@ -532,7 +532,7 @@ \section{Filter Conventions}
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(ExampleImageFilter, ImageToImageFilter);
+   itkOverrideGetNameOfClassMacro(ExampleImageFilter);
 \end{minted}
 
 The default constructor should be \code{protected}, and provide sensible