diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 25510da510..465735b343 100644
--- a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -177,8 +177,8 @@ Foam::tensor Foam::conformalVoronoiMesh::requiredAlignment
     {
         vector spoke
         (
-            Foam::cos(i*mathematicalConstant::twoPi/s),
-            Foam::sin(i*mathematicalConstant::twoPi/s),
+            Foam::cos(i*constant::math::twoPi/s),
+            Foam::sin(i*constant::math::twoPi/s),
             0
         );
 
@@ -471,8 +471,8 @@ void Foam::conformalVoronoiMesh::insertInternalEdgePointGroup
     point reflectedB = reflMasterPt - 2*ppDist*nB;
 
     scalar totalAngle =
-        180*(mathematicalConstant::pi + acos(mag(nA & nB)))
-       /mathematicalConstant::pi;
+        180*(constant::math::pi + acos(mag(nA & nB)))
+       /constant::math::pi;
 
     // Number of quadrants the angle should be split into
     int nQuads = int(totalAngle/cvMeshControls().maxQuadAngle()) + 1;
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 0830fb9103..45e642b216 100644
--- a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -57,7 +57,7 @@ SourceFiles
 #include "triSurfaceTools.H"
 #include "indexedOctree.H"
 #include "treeDataPoint.H"
-#include "mathematicalConstants.H"
+#include "mathConstants.H"
 #include "transform.H"
 #include "volFields.H"
 #include "fvMesh.H"
diff --git a/src/conformalVoronoiMesh/cvControls/cvControls.C b/src/conformalVoronoiMesh/cvControls/cvControls.C
index 211d824f89..8cf0e1257f 100644
--- a/src/conformalVoronoiMesh/cvControls/cvControls.C
+++ b/src/conformalVoronoiMesh/cvControls/cvControls.C
@@ -107,7 +107,7 @@ Foam::cvControls::cvControls
     cosAlignmentAcceptanceAngle_ = cos
     (
         readScalar(motionDict.lookup("alignmentAcceptanceAngle"))
-       *mathematicalConstant::pi/180
+       *constant::math::pi/180
     );
 
     // Point removal criteria
@@ -130,7 +130,7 @@ Foam::cvControls::cvControls
     cosInsertionAcceptanceAngle_ = cos
     (
         readScalar(insertionDict.lookup("acceptanceAngle"))
-       *mathematicalConstant::pi/180
+       *constant::math::pi/180
     );
 
     // Point removal criteria
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
index 6b81cc4102..a907971e28 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
@@ -47,7 +47,7 @@ defineTypeNameAndDebug(featureEdgeMesh, 0);
 
 Foam::scalar Foam::featureEdgeMesh::cosNormalAngleTol_ = Foam::cos
 (
-    0.1*mathematicalConstant::pi/180.0
+    0.1*constant::math::pi/180.0
 );