diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian2D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian2D.h
index c822be9f8b7e2..44cac1dd68ccf 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian2D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian2D.h
@@ -185,7 +185,7 @@ class Cartesian2D {
       return *this;
    }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -207,7 +207,7 @@ class Cartesian2D {
 
 } // end namespace ROOT
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 // need to put here setter methods to resolve nasty cyclical dependencies
 // I need to include other coordinate systems only when Cartesian is already defined
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian3D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian3D.h
index c41c9a802a9c2..ab54226ae1e0c 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian3D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian3D.h
@@ -224,7 +224,7 @@ class Cartesian3D {
       return *this;
    }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -250,7 +250,7 @@ class Cartesian3D {
 
 } // end namespace ROOT
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 // need to put here setter methods to resolve nasty cyclical dependencies
 // I need to include other coordinate systems only when Cartesian is already defined
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/Cylindrical3D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/Cylindrical3D.h
index 560922b877f50..6c61251367c0e 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/Cylindrical3D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/Cylindrical3D.h
@@ -217,7 +217,7 @@ class Cylindrical3D {
 
    // (none)
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -247,7 +247,7 @@ class Cylindrical3D {
 
 #include "MathX/GenVectorX/Cartesian3D.h"
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "MathX/GenVectorX/GenVector_exception.h"
 #include "MathX/GenVectorX/CylindricalEta3D.h"
 #include "MathX/GenVectorX/Polar3D.h"
@@ -263,7 +263,7 @@ void Cylindrical3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz)
    *this = Cartesian3D<Scalar>(xx, yy, zz);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 
 // ====== Set member functions for coordinates in other systems =======
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/CylindricalEta3D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/CylindricalEta3D.h
index eab5cce8eca81..57b64a9b08c36 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/CylindricalEta3D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/CylindricalEta3D.h
@@ -253,7 +253,7 @@ class CylindricalEta3D {
 
    // (none)
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -283,7 +283,7 @@ class CylindricalEta3D {
 
 #include "MathX/GenVectorX/Cartesian3D.h"
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "MathX/GenVectorX/GenVector_exception.h"
 #include "MathX/GenVectorX/Polar3D.h"
 #endif
@@ -298,7 +298,7 @@ void CylindricalEta3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz)
    *this = Cartesian3D<Scalar>(xx, yy, zz);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 
 // ====== Set member functions for coordinates in other systems =======
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/DisplacementVector3D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/DisplacementVector3D.h
index 2fa1738a4af68..12cf0afb1e8e9 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/DisplacementVector3D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/DisplacementVector3D.h
@@ -628,7 +628,7 @@ operator-(DisplacementVector3D<CoordSystem1, U> v1, DisplacementVector3D<CoordSy
    return v1 -= v2;
 }
 
-// #endif // not __CINT__
+// #endif // not __CLING__
 
 /**
    Multiplication of a displacement vector by real number  a*v
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/Polar2D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/Polar2D.h
index c8ec9c531bff4..3975414175c84 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/Polar2D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/Polar2D.h
@@ -184,7 +184,7 @@ class Polar2D {
 
    // (none)
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -207,7 +207,7 @@ class Polar2D {
 
 #include "MathX/GenVectorX/Cartesian2D.h"
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "MathX/GenVectorX/GenVector_exception.h"
 #endif
 
@@ -221,7 +221,7 @@ void Polar2D<T>::SetXY(Scalar a, Scalar b)
    *this = Cartesian2D<Scalar>(a, b);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 
 // ====== Set member functions for coordinates in other systems =======
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/Polar3D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/Polar3D.h
index de66aad3d5618..f9ba59ab6c1cf 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/Polar3D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/Polar3D.h
@@ -214,7 +214,7 @@ class Polar3D {
 
    // (none)
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -244,7 +244,7 @@ class Polar3D {
 
 #include "MathX/GenVectorX/Cartesian3D.h"
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "MathX/GenVectorX/GenVector_exception.h"
 #include "MathX/GenVectorX/CylindricalEta3D.h"
 #endif
@@ -259,7 +259,7 @@ void Polar3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz)
    *this = Cartesian3D<Scalar>(xx, yy, zz);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 // ====== Set member functions for coordinates in other systems =======
 
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiE4D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiE4D.h
index 9bcd199780457..320218a417fa6 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiE4D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiE4D.h
@@ -358,7 +358,7 @@ class PtEtaPhiE4D {
    Scalar z() const { return Z(); }
    Scalar t() const { return E(); }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -384,7 +384,7 @@ class PtEtaPhiE4D {
 
 // move implementations here to avoid circle dependencies
 #include "MathX/GenVectorX/PxPyPzE4D.h"
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "MathX/GenVectorX/PtEtaPhiM4D.h"
 #endif
 
@@ -398,7 +398,7 @@ inline void PtEtaPhiE4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz,
    *this = PxPyPzE4D<Scalar>(px, py, pz, e);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 
 // ====== Set member functions for coordinates in other systems =======
@@ -440,7 +440,7 @@ inline void PtEtaPhiE4D<ScalarType>::SetM(Scalar m)
    *this = PtEtaPhiE4D<Scalar>(v);
 }
 
-#endif // endif __MAKE__CINT || G__DICTIONARY
+#endif // endif __ROOTCLING__ || G__DICTIONARY
 #endif
 
 } // end namespace ROOT_MATH_ARCH
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiM4D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiM4D.h
index 7ac3a5440c01b..11e74e616020a 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiM4D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiM4D.h
@@ -378,7 +378,7 @@ class PtEtaPhiM4D {
    Scalar z() const { return Z(); }
    Scalar t() const { return E(); }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -415,7 +415,7 @@ inline void PtEtaPhiM4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz,
    *this = PxPyPzE4D<Scalar>(px, py, pz, e);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 
 // ====== Set member functions for coordinates in other systems =======
@@ -457,7 +457,7 @@ void PtEtaPhiM4D<ScalarType>::SetE(Scalar energy)
    *this = PtEtaPhiM4D<Scalar>(v);
 }
 
-#endif // endif __MAKE__CINT || G__DICTIONARY
+#endif // endif __ROOTCLING__ || G__DICTIONARY
 #endif
 
 } // end namespace ROOT_MATH_ARCH
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzE4D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzE4D.h
index 89e960764734c..78470700cf609 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzE4D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzE4D.h
@@ -319,7 +319,7 @@ class PxPyPzE4D {
    Scalar z() const { return fZ; }
    Scalar t() const { return fT; }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -347,7 +347,7 @@ class PxPyPzE4D {
 } // end namespace ROOT_MATH_ARCH
 } // end namespace ROOT
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 // move implementations here to avoid circle dependencies
 
@@ -403,7 +403,7 @@ void PxPyPzE4D<ScalarType>::SetM(Scalar m)
 
 } // end namespace ROOT
 
-#endif // endif __MAKE__CINT || G__DICTIONARY
+#endif // endif __ROOTCLING__ || G__DICTIONARY
 #endif
 
 #endif // ROOT_MathX_GenVectorX_PxPyPzE4D
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzM4D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzM4D.h
index fb2b0289d48f9..e8f7ef5bb81c5 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzM4D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzM4D.h
@@ -336,7 +336,7 @@ class PxPyPzM4D {
    Scalar z() const { return Z(); }
    Scalar t() const { return E(); }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -394,7 +394,7 @@ inline void PxPyPzM4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz, S
    *this = PxPyPzE4D<Scalar>(px, py, pz, e);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
 
 // ====== Set member functions for coordinates in other systems =======
@@ -438,7 +438,7 @@ inline void PxPyPzM4D<ScalarType>::SetE(ScalarType energy)
    *this = PxPyPzM4D<ScalarType>(v);
 }
 
-#endif // endif __MAKE__CINT || G__DICTIONARY
+#endif // endif __ROOTCLING__ || G__DICTIONARY
 #endif
 
 } // end namespace ROOT_MATH_ARCH
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/Transform3D.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/Transform3D.h
index 2604a63726146..cbb3c281902fa 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/Transform3D.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/Transform3D.h
@@ -197,7 +197,7 @@ class Transform3D {
    */
    explicit Transform3D(const Translation3D<T> &t) { AssignFrom(t.Vect()); }
 
-   // #if !defined(__MAKECINT__) && !defined(G__DICTIONARY)  // this is ambiguous with double * , double *
+   // #if !defined(__ROOTCLING__) && !defined(G__DICTIONARY)  // this is ambiguous with double * , double *
 
 #ifdef OLD_VERSION
    /**
diff --git a/math/experimental/genvectorx/inc/MathX/GenVectorX/VectorUtil.h b/math/experimental/genvectorx/inc/MathX/GenVectorX/VectorUtil.h
index 24fcbdb65faa5..e7bcd272bd975 100644
--- a/math/experimental/genvectorx/inc/MathX/GenVectorX/VectorUtil.h
+++ b/math/experimental/genvectorx/inc/MathX/GenVectorX/VectorUtil.h
@@ -281,7 +281,7 @@ inline typename Vector1::Scalar InvariantMass2(const Vector1 &v1, const Vector2
 
 // rotation and transformations
 
-#ifndef __CINT__
+#ifndef __CLING__
 /**
  rotation along X axis for a generic vector by an Angle alpha
  returning a new vector.
diff --git a/math/experimental/genvectorx/inc/MathX/LinkDef_GenVector.h b/math/experimental/genvectorx/inc/MathX/LinkDef_GenVector.h
index f180f59a3ab67..4332d36307f07 100644
--- a/math/experimental/genvectorx/inc/MathX/LinkDef_GenVector.h
+++ b/math/experimental/genvectorx/inc/MathX/LinkDef_GenVector.h
@@ -1,7 +1,7 @@
 // @(#)root/mathcore:$Id$
 // Authors: W. Brown, M. Fischler, L. Moneta    2005
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -669,7 +669,7 @@
 #pragma link C++ typedef ROOT::Math::RhoZPhiVector;
 #pragma link C++ typedef ROOT::Math::PxPyPzEVector;
 
-// tyoedef for floating types
+// typedef for floating types
 
 #pragma link C++ typedef ROOT::Math::XYVectorF;
 #pragma link C++ typedef ROOT::Math::Polar2DVectorF;
diff --git a/math/experimental/genvectorx/inc/MathX/LinkDef_GenVector32.h b/math/experimental/genvectorx/inc/MathX/LinkDef_GenVector32.h
index 594734d8dfe87..eafd4e4add828 100644
--- a/math/experimental/genvectorx/inc/MathX/LinkDef_GenVector32.h
+++ b/math/experimental/genvectorx/inc/MathX/LinkDef_GenVector32.h
@@ -3,7 +3,7 @@
 
 // Linkdef for Doublr32_t types
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;