From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 10 Mar 2020 09:27:43 +0000 (+0100)
Subject: do not talk about tasks anymore
X-Git-Tag: v3.26~761
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c0c7607cc0cb97760a59eb3f40481fbe9469cc0a

do not talk about tasks anymore
---

diff --git a/examples/s4u/actor-kill/s4u-actor-kill.cpp b/examples/s4u/actor-kill/s4u-actor-kill.cpp
index 8f3d15a398..ae162a1ef7 100644
--- a/examples/s4u/actor-kill/s4u-actor-kill.cpp
+++ b/examples/s4u/actor-kill/s4u-actor-kill.cpp
@@ -13,7 +13,7 @@ static void victimA_fun()
   XBT_INFO("Hello!");
   XBT_INFO("Suspending myself");
   simgrid::s4u::this_actor::suspend(); /* - Start by suspending itself */
-  XBT_INFO("OK, OK. Let's work");      /* - Then is resumed and start to execute a task */
+  XBT_INFO("OK, OK. Let's work");      /* - Then is resumed and start to execute some flops */
   simgrid::s4u::this_actor::execute(1e9);
   XBT_INFO("Bye!"); /* - But will never reach the end of it */
 }
diff --git a/examples/s4u/app-pingpong/s4u-app-pingpong.cpp b/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
index 0bd97377fd..f80ef71e9b 100644
--- a/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
+++ b/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
@@ -11,7 +11,7 @@ static void pinger(simgrid::s4u::Mailbox* mailbox_in, simgrid::s4u::Mailbox* mai
 {
   XBT_INFO("Ping from mailbox %s to mailbox %s", mailbox_in->get_name().c_str(), mailbox_out->get_name().c_str());
 
-  /* - Do the ping with a 1-Byte task (latency bound) ... */
+  /* - Do the ping with a 1-Byte payload (latency bound) ... */
   double* payload = new double();
   *payload        = simgrid::s4u::Engine::get_clock();
 
@@ -20,7 +20,7 @@ static void pinger(simgrid::s4u::Mailbox* mailbox_in, simgrid::s4u::Mailbox* mai
   const double* sender_time = static_cast<double*>(mailbox_in->get());
 
   double communication_time = simgrid::s4u::Engine::get_clock() - *sender_time;
-  XBT_INFO("Task received : large communication (bandwidth bound)");
+  XBT_INFO("Payload received : large communication (bandwidth bound)");
   XBT_INFO("Pong time (bandwidth bound): %.3f", communication_time);
   delete sender_time;
 }
@@ -32,14 +32,14 @@ static void ponger(simgrid::s4u::Mailbox* mailbox_in, simgrid::s4u::Mailbox* mai
   /* - Receive the (small) ping first ....*/
   const double* sender_time = static_cast<double*>(mailbox_in->get());
   double communication_time = simgrid::s4u::Engine::get_clock() - *sender_time;
-  XBT_INFO("Task received : small communication (latency bound)");
-  XBT_INFO(" Ping time (latency bound) %f", communication_time);
+  XBT_INFO("Payload received : small communication (latency bound)");
+  XBT_INFO("Ping time (latency bound) %f", communication_time);
   delete sender_time;
 
   /*  - ... Then send a 1GB pong back (bandwidth bound) */
   double* payload = new double();
   *payload        = simgrid::s4u::Engine::get_clock();
-  XBT_INFO("task_bw->data = %.3f", *payload);
+  XBT_INFO("payload = %.3f", *payload);
 
   mailbox_out->put(payload, 1e9);
 }
diff --git a/examples/s4u/app-pingpong/s4u-app-pingpong.tesh b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
index 8a4042a427..7c01272589 100644
--- a/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
+++ b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
@@ -5,10 +5,10 @@ p Testing with default compound
 $ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2
 > [  0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1
-> [  0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound)
-> [  0.019014] (2:ponger@Jupiter)  Ping time (latency bound) 0.019014
-> [  0.019014] (2:ponger@Jupiter) task_bw->data = 0.019
-> [150.178356] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
+> [  0.019014] (2:ponger@Jupiter) Payload received : small communication (latency bound)
+> [  0.019014] (2:ponger@Jupiter) Ping time (latency bound) 0.019014
+> [  0.019014] (2:ponger@Jupiter) payload = 0.019
+> [150.178356] (1:pinger@Tremblay) Payload received : large communication (bandwidth bound)
 > [150.178356] (1:pinger@Tremblay) Pong time (bandwidth bound): 150.159
 > [150.178356] (0:maestro@) Total simulation time: 150.178
 
@@ -18,10 +18,10 @@ $ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--cfg=network/op
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/optim' to 'Full'
 > [  0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2
 > [  0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1
-> [  0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound)
-> [  0.019014] (2:ponger@Jupiter)  Ping time (latency bound) 0.019014
-> [  0.019014] (2:ponger@Jupiter) task_bw->data = 0.019
-> [150.178356] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
+> [  0.019014] (2:ponger@Jupiter) Payload received : small communication (latency bound)
+> [  0.019014] (2:ponger@Jupiter) Ping time (latency bound) 0.019014
+> [  0.019014] (2:ponger@Jupiter) payload = 0.019
+> [150.178356] (1:pinger@Tremblay) Payload received : large communication (bandwidth bound)
 > [150.178356] (1:pinger@Tremblay) Pong time (bandwidth bound): 150.159
 > [150.178356] (0:maestro@) Total simulation time: 150.178
 
@@ -32,10 +32,10 @@ $ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model:C
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2
 > [  0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1
-> [  0.001462] (2:ponger@Jupiter) Task received : small communication (latency bound)
-> [  0.001462] (2:ponger@Jupiter)  Ping time (latency bound) 0.001462
-> [  0.001462] (2:ponger@Jupiter) task_bw->data = 0.001
-> [145.639041] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
+> [  0.001462] (2:ponger@Jupiter) Payload received : small communication (latency bound)
+> [  0.001462] (2:ponger@Jupiter) Ping time (latency bound) 0.001462
+> [  0.001462] (2:ponger@Jupiter) payload = 0.001
+> [145.639041] (1:pinger@Tremblay) Payload received : large communication (bandwidth bound)
 > [145.639041] (1:pinger@Tremblay) Pong time (bandwidth bound): 145.638
 > [145.639041] (0:maestro@) Total simulation time: 145.639
 
@@ -47,9 +47,9 @@ $ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform_constant.xml "--cfg=h
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant'
 > [  0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2
 > [  0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1
-> [ 13.010000] (2:ponger@Jupiter) Task received : small communication (latency bound)
-> [ 13.010000] (2:ponger@Jupiter)  Ping time (latency bound) 13.010000
-> [ 13.010000] (2:ponger@Jupiter) task_bw->data = 13.010
-> [ 26.020000] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
+> [ 13.010000] (2:ponger@Jupiter) Payload received : small communication (latency bound)
+> [ 13.010000] (2:ponger@Jupiter) Ping time (latency bound) 13.010000
+> [ 13.010000] (2:ponger@Jupiter) payload = 13.010
+> [ 26.020000] (1:pinger@Tremblay) Payload received : large communication (bandwidth bound)
 > [ 26.020000] (1:pinger@Tremblay) Pong time (bandwidth bound): 13.010
 > [ 26.020000] (0:maestro@) Total simulation time: 26.020
diff --git a/examples/s4u/app-token-ring/s4u-app-token-ring.cpp b/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
index acd4718eac..9ead2ac9bb 100644
--- a/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
+++ b/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
@@ -12,7 +12,7 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_token_ring, "Messages specific for this s4u example");
 
 class RelayRunner {
-  size_t task_comm_size = 1000000; /* The token is 1MB long*/
+  size_t token_size = 1000000; /* The token is 1MB long*/
   simgrid::s4u::Mailbox* my_mailbox;
   simgrid::s4u::Mailbox* neighbor_mailbox;
   unsigned int rank      = 0;
@@ -39,14 +39,14 @@ public:
       /* The root actor (rank 0) first sends the token then waits to receive it back */
       XBT_INFO("Host \"%u\" send 'Token' to Host \"%s\"", rank, neighbor_mailbox->get_cname());
       std::string msg = "Token";
-      neighbor_mailbox->put(&msg, task_comm_size);
+      neighbor_mailbox->put(&msg, token_size);
       const std::string* res = static_cast<std::string*>(my_mailbox->get());
       XBT_INFO("Host \"%u\" received \"%s\"", rank, res->c_str());
     } else {
       std::string* res = static_cast<std::string*>(my_mailbox->get());
       XBT_INFO("Host \"%u\" received \"%s\"", rank, res->c_str());
       XBT_INFO("Host \"%u\" send 'Token' to Host \"%s\"", rank, neighbor_mailbox->get_cname());
-      neighbor_mailbox->put(res, task_comm_size);
+      neighbor_mailbox->put(res, token_size);
     }
   }
 };
diff --git a/examples/s4u/async-ready/s4u-async-ready.cpp b/examples/s4u/async-ready/s4u-async-ready.cpp
index 6745ee3b0b..68f1242148 100644
--- a/examples/s4u/async-ready/s4u-async-ready.cpp
+++ b/examples/s4u/async-ready/s4u-async-ready.cpp
@@ -29,8 +29,8 @@ static void peer(int argc, char** argv)
 {
   xbt_assert(argc == 5, "Expecting 4 parameters from the XML deployment file but got %d", argc);
   int my_id           = std::stoi(argv[1]); /* - my id */
-  long messages_count = std::stol(argv[2]); /* - number of tasks */
-  double msg_size     = std::stol(argv[3]); /* - communication cost in bytes */
+  long messages_count = std::stol(argv[2]); /* - number of message */
+  double msg_size     = std::stol(argv[3]); /* - message size in bytes */
   long peers_count    = std::stod(argv[4]); /* - number of peers */
 
   /* Set myself as the persistent receiver of my mailbox so that messages start flowing to me as soon as they are put into it */
diff --git a/examples/s4u/async-wait/s4u-async-wait.cpp b/examples/s4u/async-wait/s4u-async-wait.cpp
index 1a3fb9b9a3..37d6058293 100644
--- a/examples/s4u/async-wait/s4u-async-wait.cpp
+++ b/examples/s4u/async-wait/s4u-async-wait.cpp
@@ -21,8 +21,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_wait, "Messages specific for this s4u exa
 static void sender(int argc, char** argv)
 {
   xbt_assert(argc == 3, "Expecting 2 parameters from the XML deployment file but got %d", argc);
-  long messages_count  = std::stol(argv[1]); /* - number of tasks */
-  double msg_size         = std::stod(argv[2]); /* - communication cost in bytes */
+  long messages_count     = std::stol(argv[1]); /* - number of messages */
+  double msg_size         = std::stod(argv[2]); /* - message size in bytes */
   double sleep_start_time = 5.0;
   double sleep_test_time  = 0;
 
diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp
index da09d449a5..141d7498dc 100644
--- a/examples/s4u/async-waitall/s4u-async-waitall.cpp
+++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp
@@ -20,9 +20,9 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_waitall, "Messages specific for this s4u example");
 
 class Sender {
-  long messages_count;  /* - number of tasks */
+  long messages_count;  /* - number of messages */
   long receivers_count; /* - number of receivers */
-  double msg_size;      /* - communication cost in bytes */
+  double msg_size;      /* - message size in bytes */
 
 public:
   explicit Sender(std::vector<std::string> args)
diff --git a/examples/s4u/async-waitany/s4u-async-waitany.cpp b/examples/s4u/async-waitany/s4u-async-waitany.cpp
index 293deec65b..ef890fe424 100644
--- a/examples/s4u/async-waitany/s4u-async-waitany.cpp
+++ b/examples/s4u/async-waitany/s4u-async-waitany.cpp
@@ -25,9 +25,9 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_waitall, "Messages specific for this s4u example");
 
 class Sender {
-  long messages_count;  /* - number of tasks */
+  long messages_count;  /* - number of messages */
   long receivers_count; /* - number of receivers */
-  double msg_size;      /* - communication cost in bytes */
+  double msg_size;      /* - message size in bytes */
 
 public:
   explicit Sender(std::vector<std::string> args)
diff --git a/examples/s4u/async-waituntil/s4u-async-waituntil.cpp b/examples/s4u/async-waituntil/s4u-async-waituntil.cpp
index bce6ec6309..f2a7c83b9a 100644
--- a/examples/s4u/async-waituntil/s4u-async-waituntil.cpp
+++ b/examples/s4u/async-waituntil/s4u-async-waituntil.cpp
@@ -20,8 +20,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_waituntil, "Messages specific for this s4
 static void sender(int argc, char** argv)
 {
   xbt_assert(argc == 4, "Expecting 3 parameters from the XML deployment file but got %d", argc);
-  long messages_count  = std::stol(argv[1]); /* - number of tasks */
-  double msg_size      = std::stol(argv[2]); /* - communication cost in bytes */
+  long messages_count  = std::stol(argv[1]); /* - number of messages */
+  double msg_size      = std::stol(argv[2]); /* - message size in bytes */
   long receivers_count = std::stod(argv[3]); /* - number of receivers */
 
   std::vector<simgrid::s4u::CommPtr> pending_comms;
diff --git a/examples/s4u/cloud-capping/s4u-cloud-capping.cpp b/examples/s4u/cloud-capping/s4u-cloud-capping.cpp
index 8a958a9555..5860b857b2 100644
--- a/examples/s4u/cloud-capping/s4u-cloud-capping.cpp
+++ b/examples/s4u/cloud-capping/s4u-cloud-capping.cpp
@@ -64,17 +64,17 @@ static void test_dynamic_change()
   simgrid::s4u::Actor::create("worker0", vm0, worker_busy_loop, "Task0", -1);
   simgrid::s4u::Actor::create("worker1", vm1, worker_busy_loop, "Task1", pm0->get_speed());
 
-  simgrid::s4u::this_actor::sleep_for(3000); // let the tasks end
+  simgrid::s4u::this_actor::sleep_for(3000); // let the activities end
   vm0->destroy();
   vm1->destroy();
 }
 
-static void test_one_task(simgrid::s4u::Host* host)
+static void test_one_activity(simgrid::s4u::Host* host)
 {
   const double cpu_speed          = host->get_speed();
   const double computation_amount = cpu_speed * 10;
 
-  XBT_INFO("### Test: with/without task set_bound");
+  XBT_INFO("### Test: with/without activity set_bound");
 
   XBT_INFO("### Test: no bound for Task1@%s", host->get_cname());
   simgrid::s4u::Actor::create("worker0", host, worker, computation_amount, false, 0);
@@ -102,7 +102,7 @@ static void test_one_task(simgrid::s4u::Host* host)
   simgrid::s4u::this_actor::sleep_for(1000);
 }
 
-static void test_two_tasks(simgrid::s4u::Host* hostA, simgrid::s4u::Host* hostB)
+static void test_two_activities(simgrid::s4u::Host* hostA, simgrid::s4u::Host* hostB)
 {
   const double cpu_speed = hostA->get_speed();
   xbt_assert(cpu_speed == hostB->get_speed());
@@ -157,23 +157,23 @@ static void master_main()
 {
   simgrid::s4u::Host* pm0 = simgrid::s4u::Host::by_name("Fafard");
 
-  XBT_INFO("# 1. Put a single task on a PM. ");
-  test_one_task(pm0);
+  XBT_INFO("# 1. Put a single activity on a PM. ");
+  test_one_activity(pm0);
   XBT_INFO(" ");
 
-  XBT_INFO("# 2. Put two tasks on a PM.");
-  test_two_tasks(pm0, pm0);
+  XBT_INFO("# 2. Put two activities on a PM.");
+  test_two_activities(pm0, pm0);
   XBT_INFO(" ");
 
   simgrid::s4u::VirtualMachine* vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
   vm0->start();
 
-  XBT_INFO("# 3. Put a single task on a VM. ");
-  test_one_task(vm0);
+  XBT_INFO("# 3. Put a single activity on a VM. ");
+  test_one_activity(vm0);
   XBT_INFO(" ");
 
-  XBT_INFO("# 4. Put two tasks on a VM.");
-  test_two_tasks(vm0, vm0);
+  XBT_INFO("# 4. Put two activities on a VM.");
+  test_two_activities(vm0, vm0);
   XBT_INFO(" ");
 
   vm0->destroy();
@@ -181,8 +181,8 @@ static void master_main()
   vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
   vm0->start();
 
-  XBT_INFO("# 6. Put a task on a PM and a task on a VM.");
-  test_two_tasks(pm0, vm0);
+  XBT_INFO("# 6. Put an activity on a PM and an activity on a VM.");
+  test_two_activities(pm0, vm0);
   XBT_INFO(" ");
 
   vm0->destroy();
@@ -191,16 +191,16 @@ static void master_main()
   vm0->set_bound(pm0->get_speed() / 10);
   vm0->start();
 
-  XBT_INFO("# 7. Put a single task on the VM capped by 10%%.");
-  test_one_task(vm0);
+  XBT_INFO("# 7. Put a single activity on the VM capped by 10%%.");
+  test_one_activity(vm0);
   XBT_INFO(" ");
 
-  XBT_INFO("# 8. Put two tasks on the VM capped by 10%%.");
-  test_two_tasks(vm0, vm0);
+  XBT_INFO("# 8. Put two activities on the VM capped by 10%%.");
+  test_two_activities(vm0, vm0);
   XBT_INFO(" ");
 
-  XBT_INFO("# 9. Put a task on a PM and a task on the VM capped by 10%%.");
-  test_two_tasks(pm0, vm0);
+  XBT_INFO("# 9. Put an activity on a PM and an activity on the VM capped by 10%%.");
+  test_two_activities(pm0, vm0);
   XBT_INFO(" ");
 
   vm0->destroy();
@@ -214,12 +214,12 @@ static void master_main()
   XBT_INFO("# 10. Test migration");
   const double computation_amount = cpu_speed * 10;
 
-  XBT_INFO("# 10. (a) Put a task on a VM without any bound.");
+  XBT_INFO("# 10. (a) Put an activity on a VM without any bound.");
   simgrid::s4u::Actor::create("worker0", vm0, worker, computation_amount, false, 0);
   simgrid::s4u::this_actor::sleep_for(1000);
   XBT_INFO(" ");
 
-  XBT_INFO("# 10. (b) set 10%% bound to the VM, and then put a task on the VM.");
+  XBT_INFO("# 10. (b) set 10%% bound to the VM, and then put an activity on the VM.");
   vm0->set_bound(cpu_speed / 10);
   simgrid::s4u::Actor::create("worker0", vm0, worker, computation_amount, false, 0);
   simgrid::s4u::this_actor::sleep_for(1000);
@@ -230,7 +230,7 @@ static void master_main()
   MSG_vm_migrate(vm0, pm1);
   XBT_INFO(" ");
 
-  XBT_INFO("# 10. (d) Put a task again on the VM.");
+  XBT_INFO("# 10. (d) Put an activity again on the VM.");
   simgrid::s4u::Actor::create("worker0", vm0, worker, computation_amount, false, 0);
   simgrid::s4u::this_actor::sleep_for(1000);
   XBT_INFO(" ");
diff --git a/examples/s4u/cloud-capping/s4u-cloud-capping.tesh b/examples/s4u/cloud-capping/s4u-cloud-capping.tesh
index 31ddb72653..09a7a9eef5 100644
--- a/examples/s4u/cloud-capping/s4u-cloud-capping.tesh
+++ b/examples/s4u/cloud-capping/s4u-cloud-capping.tesh
@@ -1,7 +1,7 @@
 ! output sort
 $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (1:master_@Fafard) # 1. Put a single task on a PM. 
-> [  0.000000] (1:master_@Fafard) ### Test: with/without task set_bound
+> [  0.000000] (1:master_@Fafard) # 1. Put a single activity on a PM. 
+> [  0.000000] (1:master_@Fafard) ### Test: with/without activity set_bound
 > [  0.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard
 > [ 10.000000] (2:worker0@Fafard) not bound => duration 10.000000 (76296000.000000 flops/s)
 > [1000.000000] (1:master_@Fafard) ### Test: 50% for Task1@Fafard
@@ -14,7 +14,7 @@ $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--
 > [4000.000000] (1:master_@Fafard) ### Test: 200% for Task1@Fafard (i.e., meaningless)
 > [4010.000000] (6:worker0@Fafard) bound to 152592000.000000 => duration 10.000000 (76296000.000000 flops/s)
 > [5000.000000] (1:master_@Fafard)  
-> [5000.000000] (1:master_@Fafard) # 2. Put two tasks on a PM.
+> [5000.000000] (1:master_@Fafard) # 2. Put two activities on a PM.
 > [5000.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard, no bound for Task2@Fafard
 > [5020.000000] (8:worker1@Fafard) not bound => duration 20.000000 (38148000.000000 flops/s)
 > [5020.000000] (7:worker0@Fafard) not bound => duration 20.000000 (38148000.000000 flops/s)
@@ -39,8 +39,8 @@ $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--
 > [11013.333333] (19:worker0@Fafard) bound to 57222000.000000 => duration 13.333333 (57221999.999997 flops/s)
 > [11040.000000] (20:worker1@Fafard) bound to 19074000.000000 => duration 40.000000 (19074000.000000 flops/s)
 > [12000.000000] (1:master_@Fafard)  
-> [12000.000000] (1:master_@Fafard) # 3. Put a single task on a VM. 
-> [12000.000000] (1:master_@Fafard) ### Test: with/without task set_bound
+> [12000.000000] (1:master_@Fafard) # 3. Put a single activity on a VM. 
+> [12000.000000] (1:master_@Fafard) ### Test: with/without activity set_bound
 > [12000.000000] (1:master_@Fafard) ### Test: no bound for Task1@VM0
 > [12010.000000] (21:worker0@VM0) not bound => duration 10.000000 (76296000.000000 flops/s)
 > [13000.000000] (1:master_@Fafard) ### Test: 50% for Task1@VM0
@@ -53,7 +53,7 @@ $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--
 > [16000.000000] (1:master_@Fafard) ### Test: 200% for Task1@VM0 (i.e., meaningless)
 > [16010.000000] (25:worker0@VM0) bound to 152592000.000000 => duration 10.000000 (76296000.000000 flops/s)
 > [17000.000000] (1:master_@Fafard)  
-> [17000.000000] (1:master_@Fafard) # 4. Put two tasks on a VM.
+> [17000.000000] (1:master_@Fafard) # 4. Put two activities on a VM.
 > [17000.000000] (1:master_@Fafard) ### Test: no bound for Task1@VM0, no bound for Task2@VM0
 > [17020.000000] (27:worker1@VM0) not bound => duration 20.000000 (38148000.000000 flops/s)
 > [17020.000000] (26:worker0@VM0) not bound => duration 20.000000 (38148000.000000 flops/s)
@@ -78,7 +78,7 @@ $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--
 > [23013.333333] (38:worker0@VM0) bound to 57222000.000000 => duration 13.333333 (57222000.000005 flops/s)
 > [23040.000000] (39:worker1@VM0) bound to 19074000.000000 => duration 40.000000 (19074000.000000 flops/s)
 > [24000.000000] (1:master_@Fafard)  
-> [24000.000000] (1:master_@Fafard) # 6. Put a task on a PM and a task on a VM.
+> [24000.000000] (1:master_@Fafard) # 6. Put an activity on a PM and an activity on a VM.
 > [24000.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard, no bound for Task2@VM0
 > [24020.000000] (40:worker0@Fafard) not bound => duration 20.000000 (38148000.000000 flops/s)
 > [24020.000000] (41:worker1@VM0) not bound => duration 20.000000 (38148000.000000 flops/s)
@@ -103,8 +103,8 @@ $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--
 > [30020.000000] (52:worker0@Fafard) bound to 57222000.000000 => duration 20.000000 (38148000.000000 flops/s)
 > [30040.000000] (53:worker1@VM0) bound to 19074000.000000 => duration 40.000000 (19074000.000000 flops/s)
 > [31000.000000] (1:master_@Fafard)  
-> [31000.000000] (1:master_@Fafard) # 7. Put a single task on the VM capped by 10%.
-> [31000.000000] (1:master_@Fafard) ### Test: with/without task set_bound
+> [31000.000000] (1:master_@Fafard) # 7. Put a single activity on the VM capped by 10%.
+> [31000.000000] (1:master_@Fafard) ### Test: with/without activity set_bound
 > [31000.000000] (1:master_@Fafard) ### Test: no bound for Task1@VM0
 > [31100.000000] (54:worker0@VM0) not bound => duration 100.000000 (7629600.000000 flops/s)
 > [32000.000000] (1:master_@Fafard) ### Test: 50% for Task1@VM0
@@ -117,7 +117,7 @@ $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--
 > [35000.000000] (1:master_@Fafard) ### Test: 200% for Task1@VM0 (i.e., meaningless)
 > [35100.000000] (58:worker0@VM0) bound to 152592000.000000 => duration 100.000000 (7629600.000000 flops/s)
 > [36000.000000] (1:master_@Fafard)  
-> [36000.000000] (1:master_@Fafard) # 8. Put two tasks on the VM capped by 10%.
+> [36000.000000] (1:master_@Fafard) # 8. Put two activities on the VM capped by 10%.
 > [36000.000000] (1:master_@Fafard) ### Test: no bound for Task1@VM0, no bound for Task2@VM0
 > [36200.000000] (60:worker1@VM0) not bound => duration 200.000000 (3814800.000000 flops/s)
 > [36200.000000] (59:worker0@VM0) not bound => duration 200.000000 (3814800.000000 flops/s)
@@ -142,7 +142,7 @@ $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--
 > [42200.000000] (72:worker1@VM0) bound to 19074000.000000 => duration 200.000000 (3814800.000000 flops/s)
 > [42200.000000] (71:worker0@VM0) bound to 57222000.000000 => duration 200.000000 (3814800.000000 flops/s)
 > [43000.000000] (1:master_@Fafard)  
-> [43000.000000] (1:master_@Fafard) # 9. Put a task on a PM and a task on the VM capped by 10%.
+> [43000.000000] (1:master_@Fafard) # 9. Put an activity on a PM and an activity on the VM capped by 10%.
 > [43000.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard, no bound for Task2@VM0
 > [43011.111111] (73:worker0@Fafard) not bound => duration 11.111111 (68666400.000010 flops/s)
 > [43100.000000] (74:worker1@VM0) not bound => duration 100.000000 (7629600.000000 flops/s)
@@ -168,15 +168,15 @@ $ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--
 > [49100.000000] (86:worker1@VM0) bound to 19074000.000000 => duration 100.000000 (7629600.000000 flops/s)
 > [50000.000000] (1:master_@Fafard)  
 > [50000.000000] (1:master_@Fafard) # 10. Test migration
-> [50000.000000] (1:master_@Fafard) # 10. (a) Put a task on a VM without any bound.
+> [50000.000000] (1:master_@Fafard) # 10. (a) Put an activity on a VM without any bound.
 > [50010.000000] (87:worker0@VM0) not bound => duration 10.000000 (76296000.000000 flops/s)
 > [51000.000000] (1:master_@Fafard)  
-> [51000.000000] (1:master_@Fafard) # 10. (b) set 10% bound to the VM, and then put a task on the VM.
+> [51000.000000] (1:master_@Fafard) # 10. (b) set 10% bound to the VM, and then put an activity on the VM.
 > [51100.000000] (88:worker0@VM0) not bound => duration 100.000000 (7629600.000000 flops/s)
 > [52000.000000] (1:master_@Fafard)  
 > [52000.000000] (1:master_@Fafard) # 10. (c) migrate
 > [52002.070722] (1:master_@Fafard)  
-> [52002.070722] (1:master_@Fafard) # 10. (d) Put a task again on the VM.
+> [52002.070722] (1:master_@Fafard) # 10. (d) Put an activity again on the VM.
 > [52102.070722] (91:worker0@VM0) not bound => duration 100.000000 (7629600.000000 flops/s)
 > [53002.070722] (1:master_@Fafard)  
 > [53002.070722] (1:master_@Fafard) # 11. Change a bound dynamically.
diff --git a/examples/s4u/cloud-simple/s4u-cloud-simple.cpp b/examples/s4u/cloud-simple/s4u-cloud-simple.cpp
index 9e355c42df..f8b83b91aa 100644
--- a/examples/s4u/cloud-simple/s4u-cloud-simple.cpp
+++ b/examples/s4u/cloud-simple/s4u-cloud-simple.cpp
@@ -15,7 +15,7 @@ static void computation_fun()
   simgrid::s4u::this_actor::execute(1000000);
   double clock_end = simgrid::s4u::Engine::get_clock();
 
-  XBT_INFO("%s:%s task executed %g", simgrid::s4u::this_actor::get_host()->get_cname(),
+  XBT_INFO("%s:%s executed %g", simgrid::s4u::this_actor::get_host()->get_cname(),
            simgrid::s4u::this_actor::get_cname(), clock_end - clock_sta);
 }
 
@@ -75,25 +75,26 @@ static void master_main()
 
   XBT_INFO("## Test 1 (started): check computation on normal PMs");
 
-  XBT_INFO("### Put a task on a PM");
+  XBT_INFO("### Put an activity on a PM");
   launch_computation_worker(pm0);
   simgrid::s4u::this_actor::sleep_for(2);
 
-  XBT_INFO("### Put two tasks on a PM");
+  XBT_INFO("### Put two activities on a PM");
   launch_computation_worker(pm0);
   launch_computation_worker(pm0);
   simgrid::s4u::this_actor::sleep_for(2);
 
-  XBT_INFO("### Put a task on each PM");
+  XBT_INFO("### Put an activity on each PM");
   launch_computation_worker(pm0);
   launch_computation_worker(pm1);
   simgrid::s4u::this_actor::sleep_for(2);
 
   XBT_INFO("## Test 1 (ended)");
 
-  XBT_INFO("## Test 2 (started): check impact of running a task inside a VM (there is no degradation for the moment)");
+  XBT_INFO(
+      "## Test 2 (started): check impact of running an activity inside a VM (there is no degradation for the moment)");
 
-  XBT_INFO("### Put a VM on a PM, and put a task to the VM");
+  XBT_INFO("### Put a VM on a PM, and put an activity to the VM");
   simgrid::s4u::VirtualMachine* vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
   vm0->start();
   launch_computation_worker(vm0);
@@ -102,10 +103,10 @@ static void master_main()
 
   XBT_INFO("## Test 2 (ended)");
 
-  XBT_INFO(
-      "## Test 3 (started): check impact of running a task collocated with a VM (there is no VM noise for the moment)");
+  XBT_INFO("## Test 3 (started): check impact of running an activity collocated with a VM (there is no VM noise for "
+           "the moment)");
 
-  XBT_INFO("### Put a VM on a PM, and put a task to the PM");
+  XBT_INFO("### Put a VM on a PM, and put an activity to the PM");
   vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
   vm0->start();
   launch_computation_worker(pm0);
@@ -113,10 +114,11 @@ static void master_main()
   vm0->destroy();
   XBT_INFO("## Test 3 (ended)");
 
-  XBT_INFO("## Test 4 (started): compare the cost of running two tasks inside two different VMs collocated or not (for"
-           " the moment, there is no degradation for the VMs. Hence, the time should be equals to the time of test 1");
+  XBT_INFO(
+      "## Test 4 (started): compare the cost of running two activities inside two different VMs collocated or not (for"
+      " the moment, there is no degradation for the VMs. Hence, the time should be equals to the time of test 1");
 
-  XBT_INFO("### Put two VMs on a PM, and put a task to each VM");
+  XBT_INFO("### Put two VMs on a PM, and put an activity to each VM");
   vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
   vm0->start();
   simgrid::s4u::VirtualMachine* vm1 = new simgrid::s4u::VirtualMachine("VM1", pm0, 1);
@@ -126,7 +128,7 @@ static void master_main()
   vm0->destroy();
   vm1->destroy();
 
-  XBT_INFO("### Put a VM on each PM, and put a task to each VM");
+  XBT_INFO("### Put a VM on each PM, and put an activity to each VM");
   vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
   vm1 = new simgrid::s4u::VirtualMachine("VM1", pm1, 1);
   vm0->start();
diff --git a/examples/s4u/cloud-simple/s4u-cloud-simple.tesh b/examples/s4u/cloud-simple/s4u-cloud-simple.tesh
index 6b21017035..cde295e661 100644
--- a/examples/s4u/cloud-simple/s4u-cloud-simple.tesh
+++ b/examples/s4u/cloud-simple/s4u-cloud-simple.tesh
@@ -1,33 +1,33 @@
 #!/usr/bin/env tesh
 
-p Testing a vm with two successive tasks
+p Testing a vm with two successive activities
 
 $ ${bindir:=.}/s4u-cloud-simple --log=no_loc ${platfdir:=.}/small_platform.xml
 > [Fafard:master_:(1) 0.000000] [s4u_test/INFO] ## Test 1 (started): check computation on normal PMs
-> [Fafard:master_:(1) 0.000000] [s4u_test/INFO] ### Put a task on a PM
-> [Fafard:compute:(2) 0.013107] [s4u_test/INFO] Fafard:compute task executed 0.0131068
-> [Fafard:master_:(1) 2.000000] [s4u_test/INFO] ### Put two tasks on a PM
-> [Fafard:compute:(4) 2.026214] [s4u_test/INFO] Fafard:compute task executed 0.0262137
-> [Fafard:compute:(3) 2.026214] [s4u_test/INFO] Fafard:compute task executed 0.0262137
-> [Fafard:master_:(1) 4.000000] [s4u_test/INFO] ### Put a task on each PM
-> [Tremblay:compute:(6) 4.010194] [s4u_test/INFO] Tremblay:compute task executed 0.0101942
-> [Fafard:compute:(5) 4.013107] [s4u_test/INFO] Fafard:compute task executed 0.0131068
+> [Fafard:master_:(1) 0.000000] [s4u_test/INFO] ### Put an activity on a PM
+> [Fafard:compute:(2) 0.013107] [s4u_test/INFO] Fafard:compute executed 0.0131068
+> [Fafard:master_:(1) 2.000000] [s4u_test/INFO] ### Put two activities on a PM
+> [Fafard:compute:(4) 2.026214] [s4u_test/INFO] Fafard:compute executed 0.0262137
+> [Fafard:compute:(3) 2.026214] [s4u_test/INFO] Fafard:compute executed 0.0262137
+> [Fafard:master_:(1) 4.000000] [s4u_test/INFO] ### Put an activity on each PM
+> [Tremblay:compute:(6) 4.010194] [s4u_test/INFO] Tremblay:compute executed 0.0101942
+> [Fafard:compute:(5) 4.013107] [s4u_test/INFO] Fafard:compute executed 0.0131068
 > [Fafard:master_:(1) 6.000000] [s4u_test/INFO] ## Test 1 (ended)
-> [Fafard:master_:(1) 6.000000] [s4u_test/INFO] ## Test 2 (started): check impact of running a task inside a VM (there is no degradation for the moment)
-> [Fafard:master_:(1) 6.000000] [s4u_test/INFO] ### Put a VM on a PM, and put a task to the VM
-> [VM0:compute:(7) 6.013107] [s4u_test/INFO] VM0:compute task executed 0.0131068
+> [Fafard:master_:(1) 6.000000] [s4u_test/INFO] ## Test 2 (started): check impact of running an activity inside a VM (there is no degradation for the moment)
+> [Fafard:master_:(1) 6.000000] [s4u_test/INFO] ### Put a VM on a PM, and put an activity to the VM
+> [VM0:compute:(7) 6.013107] [s4u_test/INFO] VM0:compute executed 0.0131068
 > [Fafard:master_:(1) 8.000000] [s4u_test/INFO] ## Test 2 (ended)
-> [Fafard:master_:(1) 8.000000] [s4u_test/INFO] ## Test 3 (started): check impact of running a task collocated with a VM (there is no VM noise for the moment)
-> [Fafard:master_:(1) 8.000000] [s4u_test/INFO] ### Put a VM on a PM, and put a task to the PM
-> [Fafard:compute:(8) 8.013107] [s4u_test/INFO] Fafard:compute task executed 0.0131068
+> [Fafard:master_:(1) 8.000000] [s4u_test/INFO] ## Test 3 (started): check impact of running an activity collocated with a VM (there is no VM noise for the moment)
+> [Fafard:master_:(1) 8.000000] [s4u_test/INFO] ### Put a VM on a PM, and put an activity to the PM
+> [Fafard:compute:(8) 8.013107] [s4u_test/INFO] Fafard:compute executed 0.0131068
 > [Fafard:master_:(1) 10.000000] [s4u_test/INFO] ## Test 3 (ended)
-> [Fafard:master_:(1) 10.000000] [s4u_test/INFO] ## Test 4 (started): compare the cost of running two tasks inside two different VMs collocated or not (for the moment, there is no degradation for the VMs. Hence, the time should be equals to the time of test 1
-> [Fafard:master_:(1) 10.000000] [s4u_test/INFO] ### Put two VMs on a PM, and put a task to each VM
-> [VM0:compute:(9) 10.026214] [s4u_test/INFO] VM0:compute task executed 0.0262137
-> [VM1:compute:(10) 10.026214] [s4u_test/INFO] VM1:compute task executed 0.0262137
-> [Fafard:master_:(1) 12.000000] [s4u_test/INFO] ### Put a VM on each PM, and put a task to each VM
-> [VM1:compute:(12) 12.010194] [s4u_test/INFO] VM1:compute task executed 0.0101942
-> [VM0:compute:(11) 12.013107] [s4u_test/INFO] VM0:compute task executed 0.0131068
+> [Fafard:master_:(1) 10.000000] [s4u_test/INFO] ## Test 4 (started): compare the cost of running two activities inside two different VMs collocated or not (for the moment, there is no degradation for the VMs. Hence, the time should be equals to the time of test 1
+> [Fafard:master_:(1) 10.000000] [s4u_test/INFO] ### Put two VMs on a PM, and put an activity to each VM
+> [VM0:compute:(9) 10.026214] [s4u_test/INFO] VM0:compute executed 0.0262137
+> [VM1:compute:(10) 10.026214] [s4u_test/INFO] VM1:compute executed 0.0262137
+> [Fafard:master_:(1) 12.000000] [s4u_test/INFO] ### Put a VM on each PM, and put an activity to each VM
+> [VM1:compute:(12) 12.010194] [s4u_test/INFO] VM1:compute executed 0.0101942
+> [VM0:compute:(11) 12.013107] [s4u_test/INFO] VM0:compute executed 0.0131068
 > [Fafard:master_:(1) 14.000000] [s4u_test/INFO] ## Test 4 (ended)
 > [Fafard:master_:(1) 14.000000] [s4u_test/INFO] ## Test 5  (started): Analyse network impact
 > [Fafard:master_:(1) 14.000000] [s4u_test/INFO] ### Make a connection between PM0 and PM1
diff --git a/examples/s4u/energy-exec/s4u-energy-exec.cpp b/examples/s4u/energy-exec/s4u-energy-exec.cpp
index badbfd4ede..f8afce0c08 100644
--- a/examples/s4u/energy-exec/s4u-energy-exec.cpp
+++ b/examples/s4u/energy-exec/s4u-energy-exec.cpp
@@ -26,13 +26,13 @@ static void dvfs()
   // Execute something
   start             = simgrid::s4u::Engine::get_clock();
   double flopAmount = 100E6;
-  XBT_INFO("Run a task of %.0E flops", flopAmount);
+  XBT_INFO("Run a computation of %.0E flops", flopAmount);
   simgrid::s4u::this_actor::execute(flopAmount);
-  XBT_INFO("Task done (duration: %.2f s). Current peak speed=%.0E flop/s; Current consumption: from %.0fW to %.0fW"
-           " depending on load; Energy dissipated=%.0f J",
-           simgrid::s4u::Engine::get_clock() - start, host1->get_speed(),
-           sg_host_get_wattmin_at(host1, host1->get_pstate()), sg_host_get_wattmax_at(host1, host1->get_pstate()),
-           sg_host_get_consumed_energy(host1));
+  XBT_INFO(
+      "Computation done (duration: %.2f s). Current peak speed=%.0E flop/s; Current consumption: from %.0fW to %.0fW"
+      " depending on load; Energy dissipated=%.0f J",
+      simgrid::s4u::Engine::get_clock() - start, host1->get_speed(), sg_host_get_wattmin_at(host1, host1->get_pstate()),
+      sg_host_get_wattmax_at(host1, host1->get_pstate()), sg_host_get_consumed_energy(host1));
 
   // ========= Change power peak =========
   int pstate = 2;
@@ -40,11 +40,11 @@ static void dvfs()
   XBT_INFO("========= Requesting pstate %d (speed should be of %.0E flop/s and is of %.0E flop/s)", pstate,
            host1->get_pstate_speed(pstate), host1->get_speed());
 
-  // Run another task
+  // Run another computation
   start = simgrid::s4u::Engine::get_clock();
-  XBT_INFO("Run a task of %.0E flops", flopAmount);
+  XBT_INFO("Run a computation of %.0E flops", flopAmount);
   simgrid::s4u::this_actor::execute(flopAmount);
-  XBT_INFO("Task done (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",
+  XBT_INFO("Computation done (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",
            simgrid::s4u::Engine::get_clock() - start, host1->get_speed(), sg_host_get_consumed_energy(host1));
 
   start = simgrid::s4u::Engine::get_clock();
diff --git a/examples/s4u/energy-exec/s4u-energy-exec.tesh b/examples/s4u/energy-exec/s4u-energy-exec.tesh
index 7568254cd2..22acb05dae 100644
--- a/examples/s4u/energy-exec/s4u-energy-exec.tesh
+++ b/examples/s4u/energy-exec/s4u-energy-exec.tesh
@@ -7,11 +7,11 @@ $ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[
 > [  0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=1E+08; Energy dissipated=1000.00 J
-> [ 10.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops
-> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 93W to 200W depending on load; Energy dissipated=1120 J
+> [ 10.000000] (1:dvfs_test@MyHost1) Run a computation of 1E+08 flops
+> [ 11.000000] (1:dvfs_test@MyHost1) Computation done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 93W to 200W depending on load; Energy dissipated=1120 J
 > [ 11.000000] (1:dvfs_test@MyHost1) ========= Requesting pstate 2 (speed should be of 2E+07 flop/s and is of 2E+07 flop/s)
-> [ 11.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops
-> [ 16.000000] (1:dvfs_test@MyHost1) Task done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1645 J
+> [ 11.000000] (1:dvfs_test@MyHost1) Run a computation of 1E+08 flops
+> [ 16.000000] (1:dvfs_test@MyHost1) Computation done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1645 J
 > [ 16.000000] (1:dvfs_test@MyHost1) Sleep for 4 seconds
 > [ 20.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 4.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=2005 J
 > [ 20.000000] (1:dvfs_test@MyHost1) Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 dissipated 2000 J so far.
@@ -29,11 +29,11 @@ $ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_cluster.xml "--log=root.fmt:[%
 > [  0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=1E+08; Energy dissipated=1000.00 J
-> [ 10.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops
-> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 93W to 200W depending on load; Energy dissipated=1120 J
+> [ 10.000000] (1:dvfs_test@MyHost1) Run a computation of 1E+08 flops
+> [ 11.000000] (1:dvfs_test@MyHost1) Computation done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 93W to 200W depending on load; Energy dissipated=1120 J
 > [ 11.000000] (1:dvfs_test@MyHost1) ========= Requesting pstate 2 (speed should be of 2E+07 flop/s and is of 2E+07 flop/s)
-> [ 11.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops
-> [ 16.000000] (1:dvfs_test@MyHost1) Task done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1645 J
+> [ 11.000000] (1:dvfs_test@MyHost1) Run a computation of 1E+08 flops
+> [ 16.000000] (1:dvfs_test@MyHost1) Computation done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1645 J
 > [ 16.000000] (1:dvfs_test@MyHost1) Sleep for 4 seconds
 > [ 20.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 4.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=2005 J
 > [ 20.000000] (1:dvfs_test@MyHost1) Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 dissipated 2000 J so far.
diff --git a/examples/s4u/energy-vm/s4u-energy-vm.cpp b/examples/s4u/energy-vm/s4u-energy-vm.cpp
index ab770ee5e7..91b97bfa9d 100644
--- a/examples/s4u/energy-vm/s4u-energy-vm.cpp
+++ b/examples/s4u/energy-vm/s4u-energy-vm.cpp
@@ -28,22 +28,22 @@ static void dvfs()
   simgrid::s4u::VirtualMachine* vm_host2 = new simgrid::s4u::VirtualMachine("vm_host2", host2, 1);
   vm_host2->start();
 
-  XBT_INFO("Create two tasks on Host1: both inside a VM");
+  XBT_INFO("Create two activities on Host1: both inside a VM");
   simgrid::s4u::Actor::create("p11", vm_host1, executor);
   simgrid::s4u::Actor::create("p12", vm_host1, executor);
 
-  XBT_INFO("Create two tasks on Host2: one inside a VM, the other directly on the host");
+  XBT_INFO("Create two activities on Host2: one inside a VM, the other directly on the host");
   simgrid::s4u::Actor::create("p21", vm_host2, executor);
   simgrid::s4u::Actor::create("p22", host2, executor);
 
-  XBT_INFO("Create two tasks on Host3: both directly on the host");
+  XBT_INFO("Create two activities on Host3: both directly on the host");
   simgrid::s4u::Actor::create("p31", host3, executor);
   simgrid::s4u::Actor::create("p32", host3, executor);
 
-  XBT_INFO("Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, "
+  XBT_INFO("Wait 5 seconds. The activities are still running (they run for 3 seconds, but 2 activities are co-located, "
            "so they run for 6 seconds)");
   simgrid::s4u::this_actor::sleep_for(5);
-  XBT_INFO("Wait another 5 seconds. The tasks stop at some point in between");
+  XBT_INFO("Wait another 5 seconds. The activities stop at some point in between");
   simgrid::s4u::this_actor::sleep_for(5);
 
   vm_host1->destroy();
diff --git a/examples/s4u/energy-vm/s4u-energy-vm.tesh b/examples/s4u/energy-vm/s4u-energy-vm.tesh
index 10f5dbf47b..e04ecab598 100644
--- a/examples/s4u/energy-vm/s4u-energy-vm.tesh
+++ b/examples/s4u/energy-vm/s4u-energy-vm.tesh
@@ -4,11 +4,11 @@ p Testing the mechanism for computing host energy consumption in case of VMs
 
 $ ${bindir:=.}/s4u-energy-vm ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dvfs@MyHost1) Creating and starting two VMs
-> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: both inside a VM
-> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: one inside a VM, the other directly on the host
-> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host3: both directly on the host
-> [  0.000000] (1:dvfs@MyHost1) Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds)
-> [  5.000000] (1:dvfs@MyHost1) Wait another 5 seconds. The tasks stop at some point in between
+> [  0.000000] (1:dvfs@MyHost1) Create two activities on Host1: both inside a VM
+> [  0.000000] (1:dvfs@MyHost1) Create two activities on Host2: one inside a VM, the other directly on the host
+> [  0.000000] (1:dvfs@MyHost1) Create two activities on Host3: both directly on the host
+> [  0.000000] (1:dvfs@MyHost1) Wait 5 seconds. The activities are still running (they run for 3 seconds, but 2 activities are co-located, so they run for 6 seconds)
+> [  5.000000] (1:dvfs@MyHost1) Wait another 5 seconds. The activities stop at some point in between
 > [  6.000000] (5:p22@MyHost2) This worker is done.
 > [  6.000000] (7:p32@MyHost3) This worker is done.
 > [  6.000000] (6:p31@MyHost3) This worker is done.
diff --git a/examples/s4u/exec-async/s4u-exec-async.cpp b/examples/s4u/exec-async/s4u-exec-async.cpp
index 484682f7e7..d276509689 100644
--- a/examples/s4u/exec-async/s4u-exec-async.cpp
+++ b/examples/s4u/exec-async/s4u-exec-async.cpp
@@ -7,7 +7,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 
-/* This actor simply waits for its task completion after starting it.
+/* This actor simply waits for its activity completion after starting it.
  * That's exactly equivalent to synchronous execution. */
 static void waiter()
 {
diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp b/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp
index 17acdc9823..77fba840f0 100644
--- a/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp
+++ b/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp
@@ -17,11 +17,11 @@ static int dvfs()
 
   XBT_INFO("Current power peak=%f", host->get_speed());
 
-  // Run a task
+  // Run a Computation
   simgrid::s4u::this_actor::execute(workload);
 
-  double task_time = simgrid::s4u::Engine::get_clock();
-  XBT_INFO("Task1 duration: %.2f", task_time);
+  double exec_time = simgrid::s4u::Engine::get_clock();
+  XBT_INFO("Computation1 duration: %.2f", exec_time);
 
   // Change power peak
   int new_pstate = 2;
@@ -32,11 +32,11 @@ static int dvfs()
 
   XBT_INFO("Current power peak=%f", host->get_speed());
 
-  // Run a second task
+  // Run a second Computation
   simgrid::s4u::this_actor::execute(workload);
 
-  task_time = simgrid::s4u::Engine::get_clock() - task_time;
-  XBT_INFO("Task2 duration: %.2f", task_time);
+  exec_time = simgrid::s4u::Engine::get_clock() - exec_time;
+  XBT_INFO("Computation2 duration: %.2f", exec_time);
 
   // Verify that the default pstate is set to 0
   host = simgrid::s4u::Host::by_name_or_null("MyHost2");
diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh b/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh
index bbc7cb591a..f5bb91021c 100644
--- a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh
+++ b/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh
@@ -7,16 +7,16 @@ $ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%1
 > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000
 > [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (2:dvfs_test@MyHost2) Current power peak=100000000.000000
-> [  1.000000] (1:dvfs_test@MyHost1) Task1 duration: 1.00
+> [  1.000000] (1:dvfs_test@MyHost1) Computation1 duration: 1.00
 > [  1.000000] (1:dvfs_test@MyHost1) Changing power peak value to 20000000.000000 (at index 2)
-> [  1.000000] (2:dvfs_test@MyHost2) Task1 duration: 1.00
+> [  1.000000] (2:dvfs_test@MyHost2) Computation1 duration: 1.00
 > [  1.000000] (2:dvfs_test@MyHost2) Changing power peak value to 20000000.000000 (at index 2)
 > [  1.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
 > [  1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
-> [  6.000000] (1:dvfs_test@MyHost1) Task2 duration: 5.00
+> [  6.000000] (1:dvfs_test@MyHost1) Computation2 duration: 5.00
 > [  6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
 > [  6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
-> [  6.000000] (2:dvfs_test@MyHost2) Task2 duration: 5.00
+> [  6.000000] (2:dvfs_test@MyHost2) Computation2 duration: 5.00
 > [  6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
 > [  6.000000] (0:maestro@) Total simulation time: 6.000000e+00
@@ -26,16 +26,16 @@ $ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10
 > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000
 > [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (2:dvfs_test@MyHost2) Current power peak=100000000.000000
-> [  1.000000] (1:dvfs_test@MyHost1) Task1 duration: 1.00
+> [  1.000000] (1:dvfs_test@MyHost1) Computation1 duration: 1.00
 > [  1.000000] (1:dvfs_test@MyHost1) Changing power peak value to 20000000.000000 (at index 2)
-> [  1.000000] (2:dvfs_test@MyHost2) Task1 duration: 1.00
+> [  1.000000] (2:dvfs_test@MyHost2) Computation1 duration: 1.00
 > [  1.000000] (2:dvfs_test@MyHost2) Changing power peak value to 20000000.000000 (at index 2)
 > [  1.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
 > [  1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
-> [  6.000000] (1:dvfs_test@MyHost1) Task2 duration: 5.00
+> [  6.000000] (1:dvfs_test@MyHost1) Computation2 duration: 5.00
 > [  6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
 > [  6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
-> [  6.000000] (2:dvfs_test@MyHost2) Task2 duration: 5.00
+> [  6.000000] (2:dvfs_test@MyHost2) Computation2 duration: 5.00
 > [  6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
 > [  6.000000] (0:maestro@) Total simulation time: 6.000000e+00
diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.cpp b/examples/s4u/exec-ptask/s4u-exec-ptask.cpp
index 2b1aa136fa..fbcfaf75a0 100644
--- a/examples/s4u/exec-ptask/s4u-exec-ptask.cpp
+++ b/examples/s4u/exec-ptask/s4u-exec-ptask.cpp
@@ -3,9 +3,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-/* Parallel tasks are convenient abstractions of parallel computational kernels that span over several machines.
+/* Parallel activities are convenient abstractions of parallel computational kernels that span over several machines.
  * To create a new one, you have to provide several things:
- *   - a vector of hosts on which the task will execute
+ *   - a vector of hosts on which the activity will execute
  *   - a vector of values, the amount of computation for each of the hosts (in flops)
  *   - a matrix of values, the amount of communication between each pair of hosts (in bytes)
  *
@@ -28,7 +28,7 @@ static void runner()
   auto hosts         = simgrid::s4u::Engine::get_instance()->get_all_hosts();
   size_t hosts_count = hosts.size();
 
-  XBT_INFO("First, build a classical parallel task, with 1 Gflop to execute on each node, "
+  XBT_INFO("First, build a classical parallel activity, with 1 Gflop to execute on each node, "
            "and 10MB to exchange between each pair");
 
   std::vector<double> computation_amounts;
@@ -60,19 +60,19 @@ static void runner()
   }
 
   /* ------[ test 3 ]----------------- */
-  XBT_INFO("Then, build a parallel task involving only computations (of different amounts) and no communication");
+  XBT_INFO("Then, build a parallel activity involving only computations (of different amounts) and no communication");
   computation_amounts = {3e8, 6e8, 1e9}; // 300Mflop, 600Mflop, 1Gflop
   communication_amounts.clear();         // no comm
   simgrid::s4u::this_actor::parallel_execute(hosts, computation_amounts, communication_amounts);
 
   /* ------[ test 4 ]----------------- */
-  XBT_INFO("Then, build a parallel task with no computation nor communication (synchro only)");
+  XBT_INFO("Then, build a parallel activity with no computation nor communication (synchro only)");
   computation_amounts.clear();
   communication_amounts.clear();
   simgrid::s4u::this_actor::parallel_execute(hosts, computation_amounts, communication_amounts);
 
   /* ------[ test 5 ]----------------- */
-  XBT_INFO("Then, Monitor the execution of a parallel task");
+  XBT_INFO("Then, Monitor the execution of a parallel activity");
   computation_amounts.assign(hosts_count, 1e6 /*1Mflop*/);
   communication_amounts = {0, 1e6, 0, 0, 0, 1e6, 1e6, 0, 0};
   simgrid::s4u::ExecPtr activity =
diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
index fbb3d4edd5..fdf031d3c3 100644
--- a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
+++ b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
@@ -5,19 +5,19 @@ $ ${bindir:=.}/s4u-exec-ptask ${platfdir}/energy_platform.xml --cfg=host/model:p
 > [  0.000000] (0:maestro@) Configuration change: Set 'tracing' to 'yes'
 > [  0.000000] (0:maestro@) Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> [  0.000000] (1:test@MyHost1) First, build a classical parallel task, with 1 Gflop to execute on each node, and 10MB to exchange between each pair
+> [  0.000000] (1:test@MyHost1) First, build a classical parallel activity, with 1 Gflop to execute on each node, and 10MB to exchange between each pair
 > [300.000000] (0:maestro@) UNCAT HOST [0.000000 - 300.000000] MyHost1 speed_used 3333333.333333
 > [300.000000] (0:maestro@) UNCAT HOST [0.000000 - 300.000000] MyHost2 speed_used 3333333.333333
 > [300.000000] (0:maestro@) UNCAT HOST [0.000000 - 300.000000] MyHost3 speed_used 3333333.333333
 > [300.000000] (0:maestro@) UNCAT LINK [0.000000 - 300.000000] bus bandwidth_used 100000.000000
 > [300.000000] (1:test@MyHost1) We can do the same with a timeout of 10 seconds enabled.
 > [310.000000] (1:test@MyHost1) Caught the expected timeout exception.
-> [310.000000] (1:test@MyHost1) Then, build a parallel task involving only computations (of different amounts) and no communication
+> [310.000000] (1:test@MyHost1) Then, build a parallel activity involving only computations (of different amounts) and no communication
 > [320.000000] (0:maestro@) UNCAT HOST [310.000000 - 320.000000] MyHost1 speed_used 30000000.000000
 > [320.000000] (0:maestro@) UNCAT HOST [310.000000 - 320.000000] MyHost2 speed_used 60000000.000000
 > [320.000000] (0:maestro@) UNCAT HOST [310.000000 - 320.000000] MyHost3 speed_used 100000000.000000
-> [320.000000] (1:test@MyHost1) Then, build a parallel task with no computation nor communication (synchro only)
-> [320.000000] (1:test@MyHost1) Then, Monitor the execution of a parallel task
+> [320.000000] (1:test@MyHost1) Then, build a parallel activity with no computation nor communication (synchro only)
+> [320.000000] (1:test@MyHost1) Then, Monitor the execution of a parallel activity
 > [320.000000] (1:test@MyHost1) Remaining flop ratio: 100%
 > [325.000000] (1:test@MyHost1) Remaining flop ratio: 83%
 > [330.000000] (1:test@MyHost1) Remaining flop ratio: 67%
diff --git a/examples/s4u/exec-remote/s4u-exec-remote.cpp b/examples/s4u/exec-remote/s4u-exec-remote.cpp
index d2a3f68cee..5b10f55d9e 100644
--- a/examples/s4u/exec-remote/s4u-exec-remote.cpp
+++ b/examples/s4u/exec-remote/s4u-exec-remote.cpp
@@ -13,7 +13,7 @@ static void wizard()
   simgrid::s4u::Host* ginette = simgrid::s4u::Host::by_name("Ginette");
   simgrid::s4u::Host* boivin  = simgrid::s4u::Host::by_name("Boivin");
 
-  XBT_INFO("I'm a wizard! I can run a task on the Ginette host from the Fafard one! Look!");
+  XBT_INFO("I'm a wizard! I can run an activity on the Ginette host from the Fafard one! Look!");
   simgrid::s4u::ExecPtr exec = simgrid::s4u::this_actor::exec_init(48.492e6);
   exec->set_host(ginette);
   exec->start();
@@ -26,7 +26,7 @@ static void wizard()
   exec->wait();
 
   XBT_INFO("Done!");
-  XBT_INFO("And now, harder. Start a remote task on Ginette and move it to Boivin after 0.5 sec");
+  XBT_INFO("And now, harder. Start a remote activity on Ginette and move it to Boivin after 0.5 sec");
   exec = simgrid::s4u::this_actor::exec_init(73293500)->set_host(ginette);
   exec->start();
 
diff --git a/examples/s4u/exec-remote/s4u-exec-remote.tesh b/examples/s4u/exec-remote/s4u-exec-remote.tesh
index 6819e407b9..37d52b0f8b 100644
--- a/examples/s4u/exec-remote/s4u-exec-remote.tesh
+++ b/examples/s4u/exec-remote/s4u-exec-remote.tesh
@@ -2,11 +2,11 @@
 
 ! output sort 19
 $ ${bindir:=.}/s4u-exec-remote ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (1:test@Fafard) I'm a wizard! I can run a task on the Ginette host from the Fafard one! Look!
+> [  0.000000] (1:test@Fafard) I'm a wizard! I can run an activity on the Ginette host from the Fafard one! Look!
 > [  0.000000] (1:test@Fafard) It started. Running 48.492Mf takes exactly one second on Ginette (but not on Fafard).
 > [  0.100000] (1:test@Fafard) Loads in flops/s: Boivin=0; Fafard=0; Ginette=48492000
 > [  1.000000] (1:test@Fafard) Done!
-> [  1.000000] (1:test@Fafard) And now, harder. Start a remote task on Ginette and move it to Boivin after 0.5 sec
+> [  1.000000] (1:test@Fafard) And now, harder. Start a remote activity on Ginette and move it to Boivin after 0.5 sec
 > [  1.500000] (1:test@Fafard) Loads before the move: Boivin=0; Fafard=0; Ginette=48492000
 > [  1.600000] (1:test@Fafard) Loads after the move: Boivin=98095000; Fafard=0; Ginette=0
 > [  2.000000] (1:test@Fafard) Done!
diff --git a/examples/s4u/network-ns3/s4u-network-ns3.cpp b/examples/s4u/network-ns3/s4u-network-ns3.cpp
index 71da8a09a1..d655c63ab9 100644
--- a/examples/s4u/network-ns3/s4u-network-ns3.cpp
+++ b/examples/s4u/network-ns3/s4u-network-ns3.cpp
@@ -22,8 +22,8 @@ static void master(int argc, char* argv[])
   XBT_DEBUG("Master started");
 
   /* data size */
-  double task_comm_size = std::stod(argv[1]);
-  int id                = std::stoi(argv[3]); // unique id to control statistics
+  double msg_size = std::stod(argv[1]);
+  int id          = std::stoi(argv[3]); // unique id to control statistics
 
   /* worker name */
   workernames[id] = xbt_strdup(argv[2]);
@@ -33,14 +33,14 @@ static void master(int argc, char* argv[])
   masternames[id] = simgrid::s4u::Host::current()->get_cname();
 
   double* payload = new double();
-  *payload        = task_comm_size;
+  *payload        = msg_size;
 
   count_finished++;
   timer_start = 1;
 
   /* time measurement */
   start_time = simgrid::s4u::Engine::get_clock();
-  mbox->put(payload, task_comm_size);
+  mbox->put(payload, msg_size);
 
   XBT_DEBUG("Finished");
 }
diff --git a/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
index cfdb61f6a8..bb3c752ed4 100644
--- a/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
+++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
@@ -25,18 +25,19 @@ static void execute_load_test()
            "changed)",
            simgrid::s4u::Engine::get_clock() - start, host->get_speed(), sg_host_get_computed_flops(host));
 
-  // Run a task
+  // Run an activity
   start = simgrid::s4u::Engine::get_clock();
-  XBT_INFO("Run a task of %.0E flops at current speed of %.0E flop/s", 200E6, host->get_speed());
+  XBT_INFO("Run an activity of %.0E flops at current speed of %.0E flop/s", 200E6, host->get_speed());
   simgrid::s4u::this_actor::execute(200E6);
 
-  XBT_INFO("Done working on my task; this took %.2fs; current peak speed: %.0E flop/s (when I started the computation, "
-           "the speed was set to %.0E flop/s); number of flops computed so "
-           "far: %.2E, average load as reported by the HostLoad plugin: %.5f (should be %.5f)",
-           simgrid::s4u::Engine::get_clock() - start, host->get_speed(), speed, sg_host_get_computed_flops(host),
-           sg_host_get_avg_load(host),
-           200E6 / (10.5 * speed * host->get_core_count() +
-                    (simgrid::s4u::Engine::get_clock() - start - 0.5) * host->get_speed() * host->get_core_count()));
+  XBT_INFO(
+      "Done working on my activity; this took %.2fs; current peak speed: %.0E flop/s (when I started the computation, "
+      "the speed was set to %.0E flop/s); number of flops computed so "
+      "far: %.2E, average load as reported by the HostLoad plugin: %.5f (should be %.5f)",
+      simgrid::s4u::Engine::get_clock() - start, host->get_speed(), speed, sg_host_get_computed_flops(host),
+      sg_host_get_avg_load(host),
+      200E6 / (10.5 * speed * host->get_core_count() +
+               (simgrid::s4u::Engine::get_clock() - start - 0.5) * host->get_speed() * host->get_core_count()));
 
   // ========= Change power peak =========
   int pstate = 1;
@@ -45,11 +46,11 @@ static void execute_load_test()
       "========= Requesting pstate %d (speed should be of %.0E flop/s and is of %.0E flop/s, average load is %.5f)",
       pstate, host->get_pstate_speed(pstate), host->get_speed(), sg_host_get_avg_load(host));
 
-  // Run a second task
+  // Run a second activity
   start = simgrid::s4u::Engine::get_clock();
-  XBT_INFO("Run a task of %.0E flops", 100E6);
+  XBT_INFO("Run an activity of %.0E flops", 100E6);
   simgrid::s4u::this_actor::execute(100E6);
-  XBT_INFO("Done working on my task; this took %.2fs; current peak speed: %.0E flop/s; number of flops computed so "
+  XBT_INFO("Done working on my activity; this took %.2fs; current peak speed: %.0E flop/s; number of flops computed so "
            "far: %.2E",
            simgrid::s4u::Engine::get_clock() - start, host->get_speed(), sg_host_get_computed_flops(host));
 
diff --git a/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
index 044b5a779c..2e77b81390 100644
--- a/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
+++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
@@ -6,12 +6,12 @@ $ ${bindir:=.}/s4u-plugin-hostload ${platfdir}/energy_platform.xml "--log=root.f
 > [  0.000000] (1:load_test@MyHost1) Initial peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (should be 0) and current average load: 0.00000 (should be 0)
 > [  0.000000] (1:load_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed)
-> [ 10.000000] (1:load_test@MyHost1) Run a task of 2E+08 flops at current speed of 1E+08 flop/s
+> [ 10.000000] (1:load_test@MyHost1) Run an activity of 2E+08 flops at current speed of 1E+08 flop/s
 > [ 10.500000] (2:change_speed@MyHost1) I slept until now, but now I'll change the speed of this host while the other actor is still computing! This should slow the computation down.
-> [ 18.000000] (1:load_test@MyHost1) Done working on my task; this took 8.00s; current peak speed: 2E+07 flop/s (when I started the computation, the speed was set to 1E+08 flop/s); number of flops computed so far: 2.00E+08, average load as reported by the HostLoad plugin: 0.04167 (should be 0.04167)
+> [ 18.000000] (1:load_test@MyHost1) Done working on my activity; this took 8.00s; current peak speed: 2E+07 flop/s (when I started the computation, the speed was set to 1E+08 flop/s); number of flops computed so far: 2.00E+08, average load as reported by the HostLoad plugin: 0.04167 (should be 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) ========= Requesting pstate 1 (speed should be of 5E+07 flop/s and is of 5E+07 flop/s, average load is 0.04167)
-> [ 18.000000] (1:load_test@MyHost1) Run a task of 1E+08 flops
-> [ 20.000000] (1:load_test@MyHost1) Done working on my task; this took 2.00s; current peak speed: 5E+07 flop/s; number of flops computed so far: 3.00E+08
+> [ 18.000000] (1:load_test@MyHost1) Run an activity of 1E+08 flops
+> [ 20.000000] (1:load_test@MyHost1) Done working on my activity; this took 2.00s; current peak speed: 5E+07 flop/s; number of flops computed so far: 3.00E+08
 > [ 20.000000] (1:load_test@MyHost1) ========= Requesting a reset of the computation and load counters
 > [ 20.000000] (1:load_test@MyHost1) After reset: 0E+00 flops computed; load is 0.00000
 > [ 20.000000] (1:load_test@MyHost1) Sleep for 4 seconds