diff --git a/apps/cpu/ConvectionOfVortex/cov.cpp b/apps/cpu/ConvectionOfVortex/cov.cpp
index c662d8953bdc76f42707dd3db6c0a268994bf93b..baa136d6a3a96e1e4ce86ce187f116e2c560530c 100644
--- a/apps/cpu/ConvectionOfVortex/cov.cpp
+++ b/apps/cpu/ConvectionOfVortex/cov.cpp
@@ -211,9 +211,9 @@ void run()
       //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
       //dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->setBulkOmegaToOmega(true);
       //
-      SPtr<BCSet> BCSet(new BCSet());
+      SPtr<BCSet> bcSet(new BCSet());
 
-      kernel->setBCSet(BCSet);
+      kernel->setBCSet(bcSet);
 
       SetKernelBlockVisitor kernelVisitor(kernel, nuLB, availMem, needMem);
       grid->accept(kernelVisitor);
diff --git a/apps/cpu/sphere/sphere.cpp b/apps/cpu/sphere/sphere.cpp
index f8249f70aa59551e89b6cbc8fdecb504dfabfcda..8a5ef89b8bf09e765236153f37cb259e075bf15e 100644
--- a/apps/cpu/sphere/sphere.cpp
+++ b/apps/cpu/sphere/sphere.cpp
@@ -219,10 +219,10 @@ void run(string configname)
          SPtr<LBMKernel> kernel(new IncompressibleCumulantLBMKernel());
          //SPtr<LBMKernel> kernel(new CompressibleCumulantLBMKernel());
 
-         SPtr<BCSet> BCSet(new BCSet());
+         SPtr<BCSet> bcSet(new BCSet());
 
 
-         kernel->setBCSet(BCSet);
+         kernel->setBCSet(bcSet);
 
          SetKernelBlockVisitor kernelVisitor(kernel, nuLB, availMem, needMem);
          grid->accept(kernelVisitor);
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
index b2e9e5505e459b756d171ac7d564d3da457ed518..fdc3f4d4347f56d52c2b8a4952da3309ca90fe19 100644
--- a/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
@@ -1562,14 +1562,14 @@ void MPIIORestartSimulationObserver::readBoundaryConds(int step)
         CbArray3D<int, IndexerX3X2X1> bcim(bcindexmatrixV, boundCondParamStr.nx1, boundCondParamStr.nx2, boundCondParamStr.nx3);
 
         SPtr<Block3D> block = grid->getBlock(bcAddArray[n].x1, bcAddArray[n].x2, bcAddArray[n].x3, bcAddArray[n].level);
-        SPtr<BCSet> bcSet = bcSet->clone(block->getKernel());
+        SPtr<BCSet> bcSetNew = bcSet->clone(block->getKernel());
         SPtr<BCArray3D> bcArr(new BCArray3D());
         bcArr->bcindexmatrix  = bcim;
         bcArr->bcvector       = bcVector;
         bcArr->indexContainer = indexContainerV;
-        bcSet->setBCArray(bcArr);
+        bcSetNew->setBCArray(bcArr);
 
-        block->getKernel()->setBCSet(bcSet);
+        block->getKernel()->setBCSet(bcSetNew);
     }
 
     delete nullBouCond;
@@ -1586,4 +1586,4 @@ void MPIIORestartSimulationObserver::readBoundaryConds(int step)
 //////////////////////////////////////////////////////////////////////////
 void MPIIORestartSimulationObserver::setLBMKernel(SPtr<LBMKernel> kernel) { this->lbmKernel = kernel; }
 //////////////////////////////////////////////////////////////////////////
-void MPIIORestartSimulationObserver::setBCSet(SPtr<BCSet> BCSet) { this->bcSet = BCSet; }
+void MPIIORestartSimulationObserver::setBCSet(SPtr<BCSet> bcSet) { this->bcSet = bcSet; }