diff --git a/ChangeLog b/ChangeLog
index c85fc9252..1a919eb7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-26  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	* src/tgba/tgba.hh (format_state): s/automata who/automata that/.
+	* src/evtgba/evtgba.hh (format_state): Likewise.
+	* src/evtgba/product.hh (format_state): Likewise.
+
 2009-04-18  Damien Lefortier <dam@lrde.epita.fr>
 
 	Extend the ELTL parser to support more complex aliases of
diff --git a/src/evtgba/evtgba.hh b/src/evtgba/evtgba.hh
index 7955f1aa1..93dba7f50 100644
--- a/src/evtgba/evtgba.hh
+++ b/src/evtgba/evtgba.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
+// Copyright (C) 2004, 2009  Laboratoire d'Informatique de Paris 6 (LIP6),
 // département Systèmes Répartis Coopératifs (SRC), Université Pierre
 // et Marie Curie.
 //
@@ -43,7 +43,7 @@ namespace spot
     /// \brief Format the state as a string for printing.
     ///
     /// This formating is the responsability of the automata
-    /// who owns the state.
+    /// that owns the state.
     virtual std::string format_state(const state* state) const = 0;
 
     virtual std::string format_label(const symbol* symbol) const;
diff --git a/src/evtgba/product.hh b/src/evtgba/product.hh
index e7db45332..202103a5d 100644
--- a/src/evtgba/product.hh
+++ b/src/evtgba/product.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
+// Copyright (C) 2004, 2009  Laboratoire d'Informatique de Paris 6 (LIP6),
 // département Systèmes Répartis Coopératifs (SRC), Université Pierre
 // et Marie Curie.
 //
@@ -42,7 +42,7 @@ namespace spot
     /// \brief Format the state as a string for printing.
     ///
     /// This formating is the responsability of the automata
-    /// who owns the state.
+    /// that owns the state.
     virtual std::string format_state(const state* state) const;
 
     /// \brief Return the set of all acceptance conditions used
diff --git a/src/tgba/tgba.hh b/src/tgba/tgba.hh
index 0b56804e2..fdb9bd55d 100644
--- a/src/tgba/tgba.hh
+++ b/src/tgba/tgba.hh
@@ -1,6 +1,6 @@
-// Copyright (C) 2003, 2004, 2005  Laboratoire d'Informatique de Paris 6 (LIP6),
-// département Systèmes Répartis Coopératifs (SRC), Université Pierre
-// et Marie Curie.
+// Copyright (C) 2003, 2004, 2005, 2009 Laboratoire d'Informatique de
+// Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
+// Université Pierre et Marie Curie.
 //
 // This file is part of Spot, a model checking library.
 //
@@ -149,7 +149,7 @@ namespace spot
     /// \brief Format the state as a string for printing.
     ///
     /// This formating is the responsability of the automata
-    /// who owns the state.
+    /// that owns the state.
     virtual std::string format_state(const state* state) const = 0;
 
     /// \brief Return a possible annotation for the transition