diff --git a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
index 80e2922bad07885266f504115fd6c3e0a9b2232b..6a79904e6fecb1235cad7f3c55c0b48cf8044dd0 100644
--- a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
@@ -280,7 +280,7 @@ void MultiphaseVelocityBC::adaptBCForDirection( const D3Q27Interactor& interacto
 void MultiphaseVelocityBC::adaptBC( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& time ) 
 {
    this->setNodeVelocity(interactor,bc,worldX1,worldX2,worldX3,time);
-   bc->setBCStrategyType(algorithmType);
+   bc->setBCStrategyType(strategyType);
 }
 /*==========================================================*/
 void MultiphaseVelocityBC::setNodeVelocity( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& timestep) 
diff --git a/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp b/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
index 81e9f1b6df53019f4c806136b4586e9854707554..ba8e9c4f1f4dfbdf29997eb81cacfee212044b80 100644
--- a/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
@@ -136,7 +136,7 @@ void MultiphaseBoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Blo
 //////////////////////////////////////////////////////////////////////////
 void MultiphaseBoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
 {
-   bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
+   bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getBCStrategy()));
 }
 
 
diff --git a/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp b/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp
index 69c65b6ecb26953e45671023af3c3a3407c40640..3bcd257e272d3ef05ad2a6e3cc5ca32d5d798633 100644
--- a/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp
@@ -136,5 +136,5 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
 //////////////////////////////////////////////////////////////////////////
 void BoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
 {
-    bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
+    bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getBCStrategy()));
 }
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
index 7dc4e4d4146231db144717bdc16b70b01bf59a8b..5c699bf28078d904d7540f129efe8051cda4935b 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
@@ -68,19 +68,19 @@ public:
 
     void setBCStrategy(SPtr<BCStrategy> alg)
     {
-        algorithmType = alg->getType();
-        algorithm     = alg;
+        strategyType = alg->getType();
+        strategy     = alg;
     }
-    SPtr<BCStrategy> getAlgorithm() { return algorithm; }
-    char getBCStrategyType() { return algorithmType; }
+    SPtr<BCStrategy> getBCStrategy() { return strategy; }
+    char getBCStrategyType() { return strategyType; }
 
 protected:
     short secondaryBcOption{ 0 };
 
     char type{ 0 };
 
-    SPtr<BCStrategy> algorithm;
-    char algorithmType{ -1 };
+    SPtr<BCStrategy> strategy;
+    char strategyType{ -1 };
 
     static const char TIMEDEPENDENT = 1 << 0; //'1';
     static const char TIMEPERIODIC  = 1 << 1; //'2';
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
index ae41e6fc6292890c6b401a96d040d96c9e2bb19a..fafbf90467cf82dd13d5ce220671365d56007cca 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
@@ -43,7 +43,7 @@ class BCArray3D;
 class BoundaryConditions;
 class Block3D;
 
-//! \brief Abstract class of baundary conditions algorithm
+//! \brief Abstract class of baundary conditions strategy
 //! \details  BCStrategy provides interface for implementation of diferent boundary conditions
 class BCStrategy
 {
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
index ecfeff73bf83b94c4b61af8dc5e946bd3de3a81a..5dacf756ceaaf28771f1c748bc87283636621c99 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
@@ -149,7 +149,7 @@ void DensityBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditio
                                const real &worldX2, const real &worldX3, const real &time)
 {
     this->setNodeDensity(interactor, bc, worldX1, worldX2, worldX3, time);
-    bc->setBCStrategyType(algorithmType);
+    bc->setBCStrategyType(strategyType);
 }
 /*==========================================================*/
 void DensityBC::setNodeDensity(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
index fe7eecebb9960107793f7bf034de5dd436d58613..fdb8e58542d6c3329a95fde10b1f668420870f50 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
@@ -56,7 +56,7 @@ public:
     void adaptBC(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc, const real & /*worldX1*/,
                  const real & /*worldX2*/, const real & /*worldX3*/, const real & /*time*/ = 0) override
     {
-        bc->setBCStrategyType(algorithmType);
+        bc->setBCStrategyType(strategyType);
     }
 
 private:
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
index eb254160395ce1ba12e22bc6ff6d6e063ce8f316..7f5e69835c803a898d8b9d4d6cff31b8be5f2a05 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
@@ -71,5 +71,5 @@ void SlipBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions>
     else if (bc->hasSlipBoundaryFlag(DIR_00M))
         bc->setNormalVector(vf::basics::constant::c0o1, vf::basics::constant::c0o1, -vf::basics::constant::c1o1);
 
-    bc->setBCStrategyType(algorithmType);
+    bc->setBCStrategyType(strategyType);
 }
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
index 1ffc4470032f6212db1e5f52195235b5b6100cc9..4318cfabb7619241003f279ccd1a29168d41e7b0 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
@@ -302,7 +302,7 @@ void VelocityBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditi
                                 const real &worldX2, const real &worldX3, const real &time)
 {
     this->setNodeVelocity(interactor, bc, worldX1, worldX2, worldX3, time);
-    bc->setBCStrategyType(algorithmType);
+    bc->setBCStrategyType(strategyType);
 }
 /*==========================================================*/
 void VelocityBC::setNodeVelocity(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
diff --git a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
index db18f090ab566bad0f4bb39493216e8db7c7be2c..af0fb29ca6fb43ea6727e2cabed6482f7ed9f512 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
@@ -112,5 +112,5 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
 //////////////////////////////////////////////////////////////////////////
 void BoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
 {
-    bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
+    bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getBCStrategy()));
 }