diff --git a/README.md b/README.md
index 076764661c12e7f98e1c9a3c007d0c7ba954a0ba..ead9189475db2f6607ea95536cb0ea24a43520cc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Batmen
 
-Batmen is a plugin to the scientific simulator [Batsim]. It allows to simulate users of large-scale distributed systems. Batmen is originally a fork of [batsched].
+Batmen is a plugin to the scientific simulator [Batsim]. It allows simulating users of large-scale distributed systems. Batmen is originally a fork of [batsched].
 
 ## How does it work?
 
@@ -13,7 +13,7 @@ A simulation with [Batsim] consists of two processes:
 In Batmen, we added a layer: **the simulation of users**. 
 
 ### User simulation
-The interaction with users happens through a "broker". The broker manages a pool of simulated users and dynamically register new jobs to sumbit. These jobs come on top of the input workload read by Batsim. 
+The interaction with users happens through a "broker". The broker manages a pool of simulated users and dynamically register new jobs to submit. These jobs come on top of the input workload read by Batsim. 
 
 Implementation, in the folder `src/users`:
 - class `Broker`: implement the broker, submitting the jobs on behalf of the users
@@ -22,9 +22,9 @@ Implementation, in the folder `src/users`:
 
 ### Types of user
 
-For now, we have developped three types of users.
+For now, we have developed three types of users.
 
-- *modelled users* (class `User`): using a model to generate the jobs to submit
+- *modeled users* (class `User`): using a model to generate the jobs to submit
 - *replay users* (class `ReplayUser`): replaying a workload trace given as input
 - *feedback users* (class `FeedbackUser`): taking feedback on the status of previous jobs into account when submitting the next one 
 
diff --git a/src/users/broker.hpp b/src/users/broker.hpp
index b2d61f0e759dee3f5c8d11bdff7374295924c719..bc9836c39c49655f6974fd04cc17e8e24f8769a8 100644
--- a/src/users/broker.hpp
+++ b/src/users/broker.hpp
@@ -20,7 +20,7 @@ public:
 
     /**
      * @brief Returns the date (in seconds, rounded to the nearest) of the next
-     * submission by the cloud broker.
+     * submission by the broker.
      * @details Two numbers are used as flags:
      *    DATE_NEVER = -1 if the broker has finished to submit.
      *    DATE_UNKNOWN = -2 if the broker doesn't have a next submission date
@@ -39,7 +39,7 @@ public:
         double date, list<Job> &jobs, list<const Profile *> &profiles);
 
     /**
-     * @brief Ackowledge the latest execution-related activity and forward the
+     * @brief Acknowledge the latest execution-related activity and forward the
      * info to interested users.
      */
     void feedback_job_status(double date, vector<string> &jobs_ended,
diff --git a/src/users/dynscheduler.hpp b/src/users/dynscheduler.hpp
index 602f72e376d6bae164d6066c539f7c05fe7f4db8..c5eb48e24b78a5f954ca93a11a8f0355de910aac 100644
--- a/src/users/dynscheduler.hpp
+++ b/src/users/dynscheduler.hpp
@@ -6,7 +6,7 @@
 
 /**
  * A scheduler inheriting from this class will handle dynamic jobs submitted
- * by the cloud broker, if any.
+ * by the broker, if any.
  * To do so, it asks the broker for the next submission date and uses batsim
  * REQUESTED_CALL to come back to the broker when it has something to submit.
  */
diff --git a/src/users/user_model.hpp b/src/users/user_model.hpp
index d11e689723e82130dc93d9c13adf8d0bc44a858f..ef2ccad3f393c326924f7e665d4eaf2c15285b8f 100644
--- a/src/users/user_model.hpp
+++ b/src/users/user_model.hpp
@@ -70,7 +70,7 @@ private:
  * @brief A user that thinks after the terminaison of her previous job before
  * submitting a new one.
  * @details When the job previously submitted finishes, the user is awaken by
- * the cloud broker. She waits for some time (the `think_time`) before
+ * the broker. She waits for some time (the `think_time`) before
  * submitting the next one.
  */
 class ThinkTimeUser : public User