diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
index 3dbc3eb48a6cd52739e059c69f42e5b9d8bfc6e4..5d036a4d94da7177e8ee76f93a27b355f562a50e 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
@@ -5,7 +5,7 @@
 #include "Communication/ExchangeData27.h"
 #include "Parameter/CudaStreamManager.h"
 #include "GPU/TurbulentViscosity.h"
-#include "KernelManager/LBKernelManager.h"
+#include "KernelManager/BCKernelManager.h"
 #include "KernelManager/ADKernelManager.h"
 #include "KernelManager/GridScalingKernelManager.h"
 #include "Kernel/Kernel.h"
@@ -355,31 +355,31 @@ void UpdateGrid27::postCollisionBC(int level)
 {
     //////////////////////////////////////////////////////////////////////////
     // V E L O C I T Y (I N F L O W)
-    this->lbKernelManager->runVelocityBCKernelPost(level);
+    this->bcKernelManager->runVelocityBCKernelPost(level);
 
     //////////////////////////////////////////////////////////////////////////
     // N O - S L I P
-    this->lbKernelManager->runNoSlipBCKernelPost(level);
+    this->bcKernelManager->runNoSlipBCKernelPost(level);
 
     //////////////////////////////////////////////////////////////////////////
     // S L I P
-    this->lbKernelManager->runSlipBCKernelPost(level);
+    this->bcKernelManager->runSlipBCKernelPost(level);
 
     //////////////////////////////////////////////////////////////////////////
     // S T R E S S (wall model)
-    this->lbKernelManager->runStressWallModelKernelPost(level);
+    this->bcKernelManager->runStressWallModelKernelPost(level);
 
     //////////////////////////////////////////////////////////////////////////
     // G E O M E T R Y
-    this->lbKernelManager->runGeoBCKernelPost(level);
+    this->bcKernelManager->runGeoBCKernelPost(level);
 
     //////////////////////////////////////////////////////////////////////////
     // O U T F L O W
-    this->lbKernelManager->runOutflowBCKernelPre(level);
+    this->bcKernelManager->runOutflowBCKernelPre(level);
 
     //////////////////////////////////////////////////////////////////////////
     // P R E S S U R E
-    this->lbKernelManager->runPressureBCKernelPost(level);
+    this->bcKernelManager->runPressureBCKernelPost(level);
 
     //////////////////////////////////////////////////////////////////////////
     // A D V E C T I O N    D I F F U S I O N
@@ -420,19 +420,19 @@ void UpdateGrid27::preCollisionBC(int level, unsigned int t)
 {
     //////////////////////////////////////////////////////////////////////////
     // V E L O C I T Y (I N F L O W)
-    this->lbKernelManager->runVelocityBCKernelPre(level);
+    this->bcKernelManager->runVelocityBCKernelPre(level);
 
     //////////////////////////////////////////////////////////////////////////
     // G E O M E T R Y
-    this->lbKernelManager->runGeoBCKernelPre(level, t, cudaMemoryManager.get());
+    this->bcKernelManager->runGeoBCKernelPre(level, t, cudaMemoryManager.get());
 
     //////////////////////////////////////////////////////////////////////////
     // P R E S S U R E
-    this->lbKernelManager->runPressureBCKernelPre(level);
+    this->bcKernelManager->runPressureBCKernelPre(level);
 
     //////////////////////////////////////////////////////////////////////////
     // O U T F L O W
-    this->lbKernelManager->runOutflowBCKernelPre(level);
+    this->bcKernelManager->runOutflowBCKernelPre(level);
 
     //////////////////////////////////////////////////////////////////////////////////
     ////only for a round off error test
@@ -498,7 +498,7 @@ UpdateGrid27::UpdateGrid27(SPtr<Parameter> para, vf::gpu::Communicator &comm, SP
 {
     chooseFunctionForCollisionAndExchange();
     chooseFunctionForRefinementAndExchange();
-    this->lbKernelManager = std::make_shared<LBKernelManager>(para, bcFactory);
+    this->bcKernelManager = std::make_shared<BCKernelManager>(para, bcFactory);
     this->adKernelManager = std::make_shared<ADKernelManager>(para);
     this->gridScalingKernelManager =  std::make_shared<GridScalingKernelManager>(para);
 }
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
index db82166a78a88aab0c4031aaac08ad2cb9d95325..661a1aafde6b392eb9568036b46d2adc62677739 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
@@ -8,7 +8,7 @@
 #include "Communication/Communicator.h"
 #include "Calculation/PorousMedia.h"
 
-class LBKernelManager;
+class BCKernelManager;
 class ADKernelManager;
 class GridScalingKernelManager;
 class Kernel;
@@ -62,7 +62,7 @@ private:
     std::vector<std::shared_ptr<PorousMedia>> pm;
     std::vector<SPtr<Kernel>> kernels;
     //! \property lbKernelManager is a shared pointer to an object of LBKernelManager
-    std::shared_ptr<LBKernelManager> lbKernelManager;
+    std::shared_ptr<BCKernelManager> bcKernelManager;
     //! \property adKernelManager is a shared pointer to an object of ADKernelManager
     std::shared_ptr<ADKernelManager> adKernelManager;
     //! \property gridScalingKernelManager is a shared pointer to an object of GridScalingKernelManager
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.cpp
similarity index 96%
rename from src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp
rename to src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.cpp
index 14a9219693bb256d19bcbc2b6fa14bd3f789137b..ff0c460b2956b2dba488884750989b9b8e8dbfa8 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.cpp
@@ -33,14 +33,14 @@
 #include <cuda_runtime.h>
 #include <helper_cuda.h>
 
-#include "LBKernelManager.h"
+#include "BCKernelManager.h"
 #include "Parameter/Parameter.h"	
 #include "GPU/GPU_Interface.h"
 #include "Calculation/DragLift.h"
 #include "Calculation/Cp.h"
 #include "BoundaryConditions/BoundaryConditionFactory.h"
 
-LBKernelManager::LBKernelManager(SPtr<Parameter> parameter, BoundaryConditionFactory* bcFactory): para(parameter)
+BCKernelManager::BCKernelManager(SPtr<Parameter> parameter, BoundaryConditionFactory* bcFactory): para(parameter)
 {
     this->velocityBoundaryConditionPost = bcFactory->getVelocityBoundaryConditionPost();
     this->noSlipBoundaryConditionPost   = bcFactory->getNoSlipBoundaryConditionPost();
@@ -49,7 +49,7 @@ LBKernelManager::LBKernelManager(SPtr<Parameter> parameter, BoundaryConditionFac
     this->geometryBoundaryConditionPost = bcFactory->getGeometryBoundaryConditionPost();
 }
 
-void LBKernelManager::runVelocityBCKernelPre(const int level) const
+void BCKernelManager::runVelocityBCKernelPre(const int level) const
 {
     if (para->getParD(level)->velocityBC.numberOfBCnodes > 0)
     {
@@ -103,7 +103,7 @@ void LBKernelManager::runVelocityBCKernelPre(const int level) const
     }
 }
 
-void LBKernelManager::runVelocityBCKernelPost(const int level) const
+void BCKernelManager::runVelocityBCKernelPost(const int level) const
 {
      if (para->getParD(level)->velocityBC.numberOfBCnodes > 0)
      {
@@ -125,7 +125,7 @@ void LBKernelManager::runVelocityBCKernelPost(const int level) const
      }
 }
 
-void LBKernelManager::runGeoBCKernelPre(const int level, unsigned int t, CudaMemoryManager* cudaMemoryManager) const{
+void BCKernelManager::runGeoBCKernelPre(const int level, unsigned int t, CudaMemoryManager* cudaMemoryManager) const{
     if (para->getParD(level)->geometryBC.numberOfBCnodes > 0){
         if (para->getCalcDragLift())
         {
@@ -233,7 +233,7 @@ void LBKernelManager::runGeoBCKernelPre(const int level, unsigned int t, CudaMem
     }
 }
 
-void LBKernelManager::runGeoBCKernelPost(const int level) const
+void BCKernelManager::runGeoBCKernelPost(const int level) const
 {
     if (para->getParD(level)->geometryBC.numberOfBCnodes > 0)
     {
@@ -297,7 +297,7 @@ void LBKernelManager::runGeoBCKernelPost(const int level) const
     }
 }
 
-void LBKernelManager::runOutflowBCKernelPre(const int level) const{
+void BCKernelManager::runOutflowBCKernelPre(const int level) const{
     if (para->getParD(level)->outflowBC.numberOfBCnodes > 0)
     {
         QPressNoRhoDev27(para->getParD(level).get(), &(para->getParD(level)->outflowBC));
@@ -324,14 +324,14 @@ void LBKernelManager::runOutflowBCKernelPre(const int level) const{
     }
 }
 
-void LBKernelManager::runPressureBCKernelPre(const int level) const{
+void BCKernelManager::runPressureBCKernelPre(const int level) const{
     if (para->getParD(level)->pressureBC.numberOfBCnodes > 0)
     {
         this->pressureBoundaryConditionPre(para->getParD(level).get(), &(para->getParD(level)->pressureBC));
     }
 }
 
-void LBKernelManager::runPressureBCKernelPost(const int level) const{
+void BCKernelManager::runPressureBCKernelPost(const int level) const{
     if (para->getParD(level)->pressureBC.numberOfBCnodes > 0)
     {
         // QPressDev27_IntBB(
@@ -350,7 +350,7 @@ void LBKernelManager::runPressureBCKernelPost(const int level) const{
     }
 }
 
-void LBKernelManager::runStressWallModelKernelPost(const int level) const{
+void BCKernelManager::runStressWallModelKernelPost(const int level) const{
     if (para->getParD(level)->stressBC.numberOfBCnodes > 0)
     {
         // QStressDevComp27(para->getParD(level)->numberofthreads, para->getParD(level)->distributions.f[0],
@@ -383,14 +383,14 @@ void LBKernelManager::runStressWallModelKernelPost(const int level) const{
 }
 
 
-void LBKernelManager::runSlipBCKernelPost(const int level) const{
+void BCKernelManager::runSlipBCKernelPost(const int level) const{
     if (para->getParD(level)->slipBC.numberOfBCnodes > 0)
     {
         slipBoundaryConditionPost(para->getParD(level).get(), &(para->getParD(level)->slipBC));
     }
 }
 
-void LBKernelManager::runNoSlipBCKernelPost(const int level) const{
+void BCKernelManager::runNoSlipBCKernelPost(const int level) const{
     if (para->getParD(level)->noSlipBC.numberOfBCnodes > 0)
     {
         noSlipBoundaryConditionPost(para->getParD(level).get(), &(para->getParD(level)->noSlipBC));
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.h
similarity index 97%
rename from src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.h
rename to src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.h
index 9ec0f71b0ab2b7b57a107061b0134940ffdfe02a..774c893c42d57e90a776ae15e1f9a208349d7392 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.h
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.h
@@ -49,12 +49,12 @@ using boundaryCondition = std::function<void(LBMSimulationParameter *, QforBound
 
 //! \class LBKernelManager
 //! \brief manage the cuda kernel calls
-class VIRTUALFLUIDS_GPU_EXPORT LBKernelManager
+class VIRTUALFLUIDS_GPU_EXPORT BCKernelManager
 {
 public:
     //! Class constructor
     //! \param parameter shared pointer to instance of class Parameter
-    LBKernelManager(SPtr<Parameter> parameter, BoundaryConditionFactory *bcFactory);
+    BCKernelManager(SPtr<Parameter> parameter, BoundaryConditionFactory *bcFactory);
 
     void setBoundaryConditionKernels();