diff --git a/src/BOPAlgo/BOPAlgo_CellsBuilder.cxx b/src/BOPAlgo/BOPAlgo_CellsBuilder.cxx
index 382e2a35f4..0b89357ebf 100644
--- a/src/BOPAlgo/BOPAlgo_CellsBuilder.cxx
+++ b/src/BOPAlgo/BOPAlgo_CellsBuilder.cxx
@@ -774,17 +774,17 @@ Standard_Boolean BOPAlgo_CellsBuilder::RemoveInternals(const BOPCol_ListOfShape&
       const TopTools_ListOfShape& aLSGen = anUnify.Generated(aSS);
       TopTools_ListIteratorOfListOfShape aIt(aLSGen);
       for (; aIt.More(); aIt.Next()) {
-        const TopoDS_Shape& aShape = aIt.Value();
-        if (!aShape.IsNull() && !aSS.IsSame(aShape)) {
-          myMapGenerated.Bind(aSS, aShape);
+        const TopoDS_Shape& aSU = aIt.Value();
+        if (!aSU.IsNull() && !aSS.IsSame(aSU)) {
+          myMapGenerated.Bind(aSS, aSU);
           bRemoved = Standard_True;
         }
       }
       const TopTools_ListOfShape& aLSMod = anUnify.Modified(aSS);
       for (aIt.Init(aLSMod); aIt.More(); aIt.Next()) {
-        const TopoDS_Shape& aShape = aIt.Value();
-        if (!aShape.IsNull() && !aSS.IsSame(aShape)) {
-          myMapGenerated.Bind(aSS, aShape);
+        const TopoDS_Shape& aSU = aIt.Value();
+        if (!aSU.IsNull() && !aSS.IsSame(aSU)) {
+          myMapGenerated.Bind(aSS, aSU);
           bRemoved = Standard_True;
         }
       }
@@ -851,7 +851,7 @@ Standard_Boolean BOPAlgo_CellsBuilder::RemoveInternals(const BOPCol_ListOfShape&
       //
       if (aNb == aLFUnique.Extent()) {
         // no faces to remove
-        TopoDS_Iterator aItS(aCB);
+        aItS.Initialize(aCB);
         for (; aItS.More(); aItS.Next()) {
           theLSNew.Append(aItS.Value());
         }
@@ -866,7 +866,7 @@ Standard_Boolean BOPAlgo_CellsBuilder::RemoveInternals(const BOPCol_ListOfShape&
       if (aBS.ErrorStatus() || aBS.Areas().Extent() != 1) {
         myWarningStatus |= RemovalOfIBForSolidsFailed;
         //
-        TopoDS_Iterator aItS(aCB);
+        aItS.Initialize(aCB);
         for (; aItS.More(); aItS.Next()) {
           theLSNew.Append(aItS.Value());
         }
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx
index c3425a8ee8..1416ff363f 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx
@@ -439,7 +439,7 @@ void BRepOffsetAPI_DraftAngle::CorrectWires()
           // tolerance of intersecting edges
           Standard_Real aTolCmp = Max(aTolCurE, aTolE);
           //
-          Standard_Integer k, aNbIntPnt = aGInter.NbPoints();
+          Standard_Integer aNbIntPnt = aGInter.NbPoints();
           for (k = 1; k <= aNbIntPnt; ++k) {
             const IntRes2d_IntersectionPoint& aP2DInt = aGInter.Point(k);
             const gp_Pnt2d& aP2D = aP2DInt.Value();
diff --git a/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx b/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx
index 134d605834..aa50f2c4bb 100644
--- a/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx
+++ b/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx
@@ -1382,8 +1382,8 @@ Standard_Integer unifysamedomgen(Draw_Interpretor& di,
     aBB.MakeCompound(aRes);
     TopTools_ListIteratorOfListOfShape aIt(aLS);
     for (; aIt.More(); aIt.Next()) {
-      const TopoDS_Shape& aShape = aIt.Value();
-      aBB.Add(aRes, aShape);
+      const TopoDS_Shape& aCurrentShape = aIt.Value();
+      aBB.Add(aRes, aCurrentShape);
     }
     DBRep::Set(a[1], aRes);
   }
@@ -1419,8 +1419,8 @@ Standard_Integer unifysamedommod(Draw_Interpretor& di,
     aBB.MakeCompound(aRes);
     TopTools_ListIteratorOfListOfShape aIt(aLS);
     for (; aIt.More(); aIt.Next()) {
-      const TopoDS_Shape& aShape = aIt.Value();
-      aBB.Add(aRes, aShape);
+      const TopoDS_Shape& aCurrentShape = aIt.Value();
+      aBB.Add(aRes, aCurrentShape);
     }
     DBRep::Set(a[1], aRes);
   }