diff --git a/src/Extrema/Extrema_GenExtCS.cxx b/src/Extrema/Extrema_GenExtCS.cxx
index 5254bac4f3..99fa65b4ad 100644
--- a/src/Extrema/Extrema_GenExtCS.cxx
+++ b/src/Extrema/Extrema_GenExtCS.cxx
@@ -302,7 +302,7 @@ void Extrema_GenExtCS::Perform(const Adaptor3d_Curve& C,
         UV(1) = aMaxCU;
         UV(2) = aMaxSU;
         UV(3) = aMaxSV;
-        math_FunctionSetRoot(myF, UV, Tol, UVinf, UVsup);
+        math_FunctionSetRoot aFunc(myF, UV, Tol, UVinf, UVsup);
         break;
       }
       //
diff --git a/src/MeshTest/MeshTest.cxx b/src/MeshTest/MeshTest.cxx
index 123368dbed..45f3776b0c 100644
--- a/src/MeshTest/MeshTest.cxx
+++ b/src/MeshTest/MeshTest.cxx
@@ -1230,7 +1230,7 @@ static Standard_Integer wavefront(Draw_Interpretor&, Standard_Integer nbarg, con
   Standard_Real aDeflection = 
     MAX3( aXmax-aXmin , aYmax-aYmin , aZmax-aZmin) * 0.004;
 
-  BRepMesh_IncrementalMesh(S, aDeflection);
+  BRepMesh_IncrementalMesh aMesh (S, aDeflection);
 
 
   TopLoc_Location L;
diff --git a/src/Poly/Poly_CoherentTriangulation.cxx b/src/Poly/Poly_CoherentTriangulation.cxx
index 95a88ec4ad..c16168b2d3 100644
--- a/src/Poly/Poly_CoherentTriangulation.cxx
+++ b/src/Poly/Poly_CoherentTriangulation.cxx
@@ -585,8 +585,8 @@ void Poly_CoherentTriangulation::RemoveLink (Poly_CoherentLink& theLink)
         else if (iNode == pTri[i]->Node(2))
           const_cast<Poly_CoherentTriangle *>(pTri[i])->mypLink[2] = 0L;
         else
-          Standard_ProgramError("Poly_CoherentTriangulation::RemoveLink: "
-                                " wrong connectivity between triangles");
+          Standard_ProgramError::Raise("Poly_CoherentTriangulation::RemoveLink: "
+                                       " wrong connectivity between triangles");
       }
     }
   } 
@@ -660,8 +660,8 @@ Standard_Boolean Poly_CoherentTriangulation::FindTriangle
         else if (aTri.Node(1) == theLink.Node(1))
           pTri[1] = &aTri;
       } else
-        Standard_ProgramError("Poly_CoherentTriangulation::FindTriangle : "
-                              " Data incoherence detected");
+        Standard_ProgramError::Raise("Poly_CoherentTriangulation::FindTriangle : "
+                                     " Data incoherence detected");
       if (pTri[0] && pTri[1])
         break;
     }
diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx
index d63a4ff424..4df516c42a 100644
--- a/src/QABugs/QABugs_19.cxx
+++ b/src/QABugs/QABugs_19.cxx
@@ -118,10 +118,10 @@ static Standard_Integer OCC23237 (Draw_Interpretor& di, Standard_Integer /*argc*
     aPM.Start();
     aTM.Start();
 
-    // do some operation that will take considerable time compared with time or starting / stopping timers
+    // do some operation that will take considerable time compared with time of starting / stopping timers
     BRepPrimAPI_MakeBox aBox (10., 10., 10.);
     BRepPrimAPI_MakeSphere aSphere (10.);
-    BRepAlgo_Cut (aBox.Shape(), aSphere.Shape());
+    BRepAlgo_Cut aCutter (aBox.Shape(), aSphere.Shape());
 
     aTM.Stop();
     aPM.Stop();
diff --git a/src/StdSelect/StdSelect_BRepSelectionTool.cxx b/src/StdSelect/StdSelect_BRepSelectionTool.cxx
index c8a16a7781..4c07608974 100644
--- a/src/StdSelect/StdSelect_BRepSelectionTool.cxx
+++ b/src/StdSelect/StdSelect_BRepSelectionTool.cxx
@@ -80,7 +80,7 @@ void StdSelect_BRepSelectionTool
 
   if( isAutoTriangulation && !BRepTools::Triangulation (theShape, Precision::Infinite()) )
   {
-    BRepMesh_IncrementalMesh(theShape, theDeflection, Standard_False, theDeviationAngle);
+    BRepMesh_IncrementalMesh aMesher(theShape, theDeflection, Standard_False, theDeviationAngle);
   }
 
   Handle(StdSelect_BRepOwner) aBrepOwner;
diff --git a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
index e13fb516d4..178b0a48fe 100644
--- a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
+++ b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
@@ -205,7 +205,7 @@ public:
 
 gp_Pnt tsee_entity0::Pnt() const
 {
-  if (!Is0()) Standard_Failure("not 0d");
+  if (!Is0()) Standard_Failure::Raise("not 0d");
   gp_Pnt P; 
   if      (IsP()) P = myEPDS->Point(myEindex).Point();
   else if (IsV()) P = BRep_Tool::Pnt(TopoDS::Vertex(myEPDS->Shape(myEindex)));