diff --git a/apps/cpu/ConvectionOfVortex/cov.cpp b/apps/cpu/ConvectionOfVortex/cov.cpp
index 35da90e5e24b2510429a08be9fa5bacdb66d33be..c662d8953bdc76f42707dd3db6c0a268994bf93b 100644
--- a/apps/cpu/ConvectionOfVortex/cov.cpp
+++ b/apps/cpu/ConvectionOfVortex/cov.cpp
@@ -290,15 +290,15 @@ void run()
       //tav->setWithGhostLayer(true);
 
       SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-      SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-      calculator->addSimulationObserver(nupsSimulationObserver);
-      calculator->addSimulationObserver(writeMQSimulationObserver);
-      //calculator->addSimulationObserver(tav);
+      SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+      simulation->addSimulationObserver(nupsSimulationObserver);
+      simulation->addSimulationObserver(writeMQSimulationObserver);
+      //simulation->addSimulationObserver(tav);
 
       //omp_set_num_threads(1);
 
       if (myid==0) UBLOG(logINFO, "Simulation-start");
-      calculator->run();
+      simulation->run();
       if (myid==0) UBLOG(logINFO, "Simulation-end");
    }
    catch (std::exception& e)
diff --git a/apps/cpu/CouetteFlow/cflow.cpp b/apps/cpu/CouetteFlow/cflow.cpp
index 11bb9b4d517d1e16889fa9d5be07fb6a9d47c18a..4297d3ac14b67a41f0bf764e823d457e212806e0 100644
--- a/apps/cpu/CouetteFlow/cflow.cpp
+++ b/apps/cpu/CouetteFlow/cflow.cpp
@@ -266,15 +266,15 @@ void bflow(string configname)
       SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
 
       SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
-      SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-      calculator->addSimulationObserver(npr);
-      calculator->addSimulationObserver(writeMQSimulationObserver);
-      calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
-      //calculator->addSimulationObserver(migSimulationObserver);
-      //calculator->addSimulationObserver(restartSimulationObserver);
+      SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+      simulation->addSimulationObserver(npr);
+      simulation->addSimulationObserver(writeMQSimulationObserver);
+      simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+      //simulation->addSimulationObserver(migSimulationObserver);
+      //simulation->addSimulationObserver(restartSimulationObserver);
 
       if (myid == 0) UBLOG(logINFO, "Simulation-start");
-      calculator->run();
+      simulation->run();
       if (myid == 0) UBLOG(logINFO, "Simulation-end");
    }
    catch (std::exception& e)
diff --git a/apps/cpu/FlowAroundCylinder/cylinder.cpp b/apps/cpu/FlowAroundCylinder/cylinder.cpp
index f5d19e9ad5dc684d1d1e318b79d7d293d40ff5a9..f8c2ac4674a7bfa98d42c0be4ebf20365f579695 100644
--- a/apps/cpu/FlowAroundCylinder/cylinder.cpp
+++ b/apps/cpu/FlowAroundCylinder/cylinder.cpp
@@ -315,13 +315,13 @@ void run(string configname)
 
 	  omp_set_num_threads(numOfThreads);
 	  SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-	  SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-	  calculator->addSimulationObserver(nupsSimulationObserver);
-     calculator->addSimulationObserver(fp);
-     calculator->addSimulationObserver(writeMQSimulationObserver);
+	  SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+	  simulation->addSimulationObserver(nupsSimulationObserver);
+     simulation->addSimulationObserver(fp);
+     simulation->addSimulationObserver(writeMQSimulationObserver);
 
       if(myid == 0) UBLOG(logINFO,"Simulation-start");
-	  calculator->run();
+	  simulation->run();
       if(myid == 0) UBLOG(logINFO,"Simulation-end");
    }
    catch(std::exception& e)
diff --git a/apps/cpu/HerschelBulkleyModel/hbflow.cpp b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
index f581304e047aa39711efe5989c02d4b5e0a44cee..a8cf213475677b55ff4e81ceaaf80b4c4d050ea5 100644
--- a/apps/cpu/HerschelBulkleyModel/hbflow.cpp
+++ b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
@@ -321,17 +321,17 @@ void bflow(string configname)
       SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
 
       SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
-      SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-      calculator->addSimulationObserver(npr);
-      calculator->addSimulationObserver(writeMQSimulationObserver);
-      calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
-      calculator->addSimulationObserver(fp);
-      calculator->addSimulationObserver(fp2);
-      //calculator->addSimulationObserver(migSimulationObserver);
-      //calculator->addSimulationObserver(restartSimulationObserver);
+      SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+      simulation->addSimulationObserver(npr);
+      simulation->addSimulationObserver(writeMQSimulationObserver);
+      simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+      simulation->addSimulationObserver(fp);
+      simulation->addSimulationObserver(fp2);
+      //simulation->addSimulationObserver(migSimulationObserver);
+      //simulation->addSimulationObserver(restartSimulationObserver);
 
       if (myid == 0) UBLOG(logINFO, "Simulation-start");
-      calculator->run();
+      simulation->run();
       if (myid == 0) UBLOG(logINFO, "Simulation-end");
    }
    catch (std::exception& e)
diff --git a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
index f2f47acd9368e1abbf2d3a0565909aca5ecfafaf..2b4e96aaa1e195072eb3eb56783952e4ccd49722 100644
--- a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
+++ b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
@@ -351,15 +351,15 @@ void bflow(string configname)
       SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
 
       SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-      SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-      calculator->addSimulationObserver(npr);
-      calculator->addSimulationObserver(fp);
-      calculator->addSimulationObserver(writeMQSimulationObserver);
-      calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
-      calculator->addSimulationObserver(restartSimulationObserver);
+      SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+      simulation->addSimulationObserver(npr);
+      simulation->addSimulationObserver(fp);
+      simulation->addSimulationObserver(writeMQSimulationObserver);
+      simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+      simulation->addSimulationObserver(restartSimulationObserver);
 
       if (myid == 0) UBLOG(logINFO, "Simulation-start");
-      calculator->run();
+      simulation->run();
       if (myid == 0) UBLOG(logINFO, "Simulation-end");
    }
    catch (std::exception& e)
diff --git a/apps/cpu/JetBreakup/JetBreakup.cpp b/apps/cpu/JetBreakup/JetBreakup.cpp
index 7d00fe1f811ec3aba2df627d725146d16d587e73..b0b25bb07aac72e0db07f92b0d8aefa281938811 100644
--- a/apps/cpu/JetBreakup/JetBreakup.cpp
+++ b/apps/cpu/JetBreakup/JetBreakup.cpp
@@ -596,15 +596,15 @@ void run(string configname)
 #endif
 
         SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-        SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-        calculator->addSimulationObserver(npr);
-        calculator->addSimulationObserver(pp);
-        calculator->addSimulationObserver(timeDepBC);
-        calculator->addSimulationObserver(rcp);
+        SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+        simulation->addSimulationObserver(npr);
+        simulation->addSimulationObserver(pp);
+        simulation->addSimulationObserver(timeDepBC);
+        simulation->addSimulationObserver(rcp);
 
         if (myid == 0)
             UBLOG(logINFO, "Simulation-start");
-        calculator->run();
+        simulation->run();
         if (myid == 0)
             UBLOG(logINFO, "Simulation-end");
     } catch (std::exception &e) {
diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp
index 0b398539acf8e7b1a187159ada58e6f51faede7d..c70c2c19e7a02129ff00f8ca3bd0d7e53894831c 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cpp
+++ b/apps/cpu/LaminarTubeFlow/ltf.cpp
@@ -328,14 +328,14 @@ void run(string configname)
       omp_set_num_threads(numOfThreads);
       numOfThreads = 1;
       SPtr<UbScheduler> stepGhostLayer(visSch);
-      SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, int(endTime)));
-      calculator->addSimulationObserver(npr);
-      calculator->addSimulationObserver(pp);
-      calculator->addSimulationObserver(migSimulationObserver);
-      //calculator->addSimulationObserver(timeDepBC);
+      SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, int(endTime)));
+      simulation->addSimulationObserver(npr);
+      simulation->addSimulationObserver(pp);
+      simulation->addSimulationObserver(migSimulationObserver);
+      //simulation->addSimulationObserver(timeDepBC);
 
       if (myid == 0) VF_LOG_INFO("Simulation-start");
-      calculator->run();
+      simulation->run();
       if (myid == 0) VF_LOG_INFO("Simulation-end");
    }
    catch (std::exception& e)
diff --git a/apps/cpu/Multiphase/Multiphase.cpp b/apps/cpu/Multiphase/Multiphase.cpp
index b04c785899f2eb65201971a625c02370286140f3..4c30d97e5a9c97125b1d91c260cef1639fbf7a3e 100644
--- a/apps/cpu/Multiphase/Multiphase.cpp
+++ b/apps/cpu/Multiphase/Multiphase.cpp
@@ -472,18 +472,18 @@ void run(string configname)
 #endif
 
         SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-        SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-        calculator->addSimulationObserver(npr);
-        calculator->addSimulationObserver(pp);
-        calculator->addSimulationObserver(timeDepBC);
-        calculator->addSimulationObserver(rcp);
+        SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+        simulation->addSimulationObserver(npr);
+        simulation->addSimulationObserver(pp);
+        simulation->addSimulationObserver(timeDepBC);
+        simulation->addSimulationObserver(rcp);
 
 
 
 
         if (myid == 0)
             UBLOG(logINFO, "Simulation-start");
-        calculator->run();
+        simulation->run();
         if (myid == 0)
             UBLOG(logINFO, "Simulation-end");
     } catch (std::exception &e) {
diff --git a/apps/cpu/MultiphaseDropletTest/droplet.cpp b/apps/cpu/MultiphaseDropletTest/droplet.cpp
index 5a12f039ccf858ef6cfd34fcbe0d7722f7db55e4..a5658a8f39055201e15619fb4dd18a6955576374 100644
--- a/apps/cpu/MultiphaseDropletTest/droplet.cpp
+++ b/apps/cpu/MultiphaseDropletTest/droplet.cpp
@@ -391,15 +391,15 @@ void run(string configname)
         omp_set_num_threads(numOfThreads);
 
         SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-        SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-        calculator->addSimulationObserver(npr);
-        calculator->addSimulationObserver(pp);
-        calculator->addSimulationObserver(rcp);
+        SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+        simulation->addSimulationObserver(npr);
+        simulation->addSimulationObserver(pp);
+        simulation->addSimulationObserver(rcp);
 
 
         if (myid == 0)
             UBLOG(logINFO, "Simulation-start");
-        calculator->run();
+        simulation->run();
         if (myid == 0)
             UBLOG(logINFO, "Simulation-end");
             
diff --git a/apps/cpu/PoiseuilleFlow/pf1.cpp b/apps/cpu/PoiseuilleFlow/pf1.cpp
index cb4528b3ad5a11cff3391e010c823848309bf7d7..0e21dea4d252dc141fa5fd75feebe24c0b80042d 100644
--- a/apps/cpu/PoiseuilleFlow/pf1.cpp
+++ b/apps/cpu/PoiseuilleFlow/pf1.cpp
@@ -191,14 +191,14 @@ void pf1()
    //start simulation 
    //omp_set_num_threads(numOfThreads);
    SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
-   SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-   calculator->addSimulationObserver(npr);
-   calculator->addSimulationObserver(writeMQSimulationObserver);
-   //calculator->addSimulationObserver(migSimulationObserver);
-   //calculator->addSimulationObserver(restartSimulationObserver);
+   SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+   simulation->addSimulationObserver(npr);
+   simulation->addSimulationObserver(writeMQSimulationObserver);
+   //simulation->addSimulationObserver(migSimulationObserver);
+   //simulation->addSimulationObserver(restartSimulationObserver);
 
    if (myid == 0) UBLOG(logINFO, "Simulation-start");
-   calculator->run();
+   simulation->run();
    if (myid == 0) UBLOG(logINFO, "Simulation-end");
    
    ppblocks->update(10);
diff --git a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
index a5cd0aff9605b6dc51fde3f5b3c677095fc1c80f..e1bfec97664f6f91e60bfbecd90604c7c62de678 100644
--- a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
+++ b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
@@ -406,15 +406,15 @@ void run(string configname)
         //omp_set_num_threads(numOfThreads);
 
         SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-        SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-        calculator->addSimulationObserver(npr);
-        calculator->addSimulationObserver(pp);
-        calculator->addSimulationObserver(rcp);
+        SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+        simulation->addSimulationObserver(npr);
+        simulation->addSimulationObserver(pp);
+        simulation->addSimulationObserver(rcp);
 
 
         if (myid == 0)
             UBLOG(logINFO, "Simulation-start");
-        calculator->run();
+        simulation->run();
         if (myid == 0)
             UBLOG(logINFO, "Simulation-end");
             
diff --git a/apps/cpu/ViskomatXL/viskomat.cpp b/apps/cpu/ViskomatXL/viskomat.cpp
index addceee87653eee5b5218790d9a7bc0ad2a7b054..d1a3cc3ee62ee76d19a80ccf0901836efce87460 100644
--- a/apps/cpu/ViskomatXL/viskomat.cpp
+++ b/apps/cpu/ViskomatXL/viskomat.cpp
@@ -431,16 +431,16 @@ void bflow(string configname)
       //SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
 
       SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-      SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-      calculator->addSimulationObserver(npr);
-      //calculator->addSimulationObserver(fp);
-      calculator->addSimulationObserver(fp2);
-      //calculator->addSimulationObserver(writeMQSimulationObserver);
-      //calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
-      calculator->addSimulationObserver(restartSimulationObserver);
+      SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+      simulation->addSimulationObserver(npr);
+      //simulation->addSimulationObserver(fp);
+      simulation->addSimulationObserver(fp2);
+      //simulation->addSimulationObserver(writeMQSimulationObserver);
+      //simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+      simulation->addSimulationObserver(restartSimulationObserver);
 
       if (myid == 0) UBLOG(logINFO, "Simulation-start");
-      calculator->run();
+      simulation->run();
       if (myid == 0) UBLOG(logINFO, "Simulation-end");
    }
    catch (std::exception& e)
diff --git a/apps/cpu/rheometer/rheometer.cpp b/apps/cpu/rheometer/rheometer.cpp
index 5b716ffb61f935c2ea0955c22042f687f43273a5..173299b0edaccf10971cb596c67d81720bdb3264 100644
--- a/apps/cpu/rheometer/rheometer.cpp
+++ b/apps/cpu/rheometer/rheometer.cpp
@@ -422,16 +422,16 @@ void bflow(string configname)
       SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
 
       SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-      SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
-      calculator->addSimulationObserver(npr);
-      calculator->addSimulationObserver(fp);
-      calculator->addSimulationObserver(fp2);
-      calculator->addSimulationObserver(writeMQSimulationObserver);
-      calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
-      //calculator->addSimulationObserver(restartSimulationObserver);
+      SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+      simulation->addSimulationObserver(npr);
+      simulation->addSimulationObserver(fp);
+      simulation->addSimulationObserver(fp2);
+      simulation->addSimulationObserver(writeMQSimulationObserver);
+      simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+      //simulation->addSimulationObserver(restartSimulationObserver);
 
       if (myid == 0) UBLOG(logINFO, "Simulation-start");
-      calculator->run();
+      simulation->run();
       if (myid == 0) UBLOG(logINFO, "Simulation-end");
    }
    catch (std::exception& e)
diff --git a/apps/cpu/sphere/sphere.cpp b/apps/cpu/sphere/sphere.cpp
index c9677c0a56d1ebedf451478714b61d5047ebf308..f8249f70aa59551e89b6cbc8fdecb504dfabfcda 100644
--- a/apps/cpu/sphere/sphere.cpp
+++ b/apps/cpu/sphere/sphere.cpp
@@ -293,14 +293,14 @@ void run(string configname)
       fp->addInteractor(sphereInt);
 
       SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
-      SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endstep));
-      calculator->addSimulationObserver(npr);
-      calculator->addSimulationObserver(fp);
-      calculator->addSimulationObserver(writeMQSimulationObserver);
+      SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endstep));
+      simulation->addSimulationObserver(npr);
+      simulation->addSimulationObserver(fp);
+      simulation->addSimulationObserver(writeMQSimulationObserver);
 
 
       if (myid == 0) UBLOG(logINFO, "Simulation-start");
-      calculator->run();
+      simulation->run();
       if (myid == 0) UBLOG(logINFO, "Simulation-end");
 
    }