diff --git a/bench/dtgbasat/gen.py b/bench/dtgbasat/gen.py
index 4777c35c0..f581506db 100755
--- a/bench/dtgbasat/gen.py
+++ b/bench/dtgbasat/gen.py
@@ -115,7 +115,7 @@ def ne(string):
 
 
 # --------------------------------------------------------------SUMMARY
-def add_winner(res, winner, looser):
+def add_winner(res, winner, loser):
     """
         Each time this function is called, it increments the scrore
         of one method against another one.
@@ -125,7 +125,7 @@ def add_winner(res, winner, looser):
     for i in range(1, res_length):  # except the first row (header)
         if winner in res[i]:
             for j in range(1, header_length):
-                if looser in res[0][j]:
+                if loser in res[0][j]:
                     if type(res[i][j]) is str:
                         res[i][j] = 1
                     else:
diff --git a/spot/ta/ta.hh b/spot/ta/ta.hh
index e790f920f..045cedf6b 100644
--- a/spot/ta/ta.hh
+++ b/spot/ta/ta.hh
@@ -1,5 +1,5 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2010, 2012, 2013, 2014, 2015, 2016 Laboratoire de Recherche et
+// Copyright (C) 2010, 2012-2017 Laboratoire de Recherche et
 // Developpement de l Epita (LRDE).
 //
 // This file is part of Spot, a model checking library.
@@ -99,7 +99,7 @@ namespace spot
     /// \brief Get the artificial initial state set of the automaton.
     /// Return 0 if this artificial state is not implemented
     /// (in this case, use \c get_initial_states_set)
-    /// The aim of adding this state is to have an unique initial state. This
+    /// The aim of adding this state is to have a unique initial state. This
     /// artificial initial state have one transition to each real initial state,
     /// and this transition is labeled by the corresponding initial condition.
     /// (For more details, see the paper cited above)
diff --git a/spot/taalgos/tgba2ta.cc b/spot/taalgos/tgba2ta.cc
index b3dda288d..434d47a46 100644
--- a/spot/taalgos/tgba2ta.cc
+++ b/spot/taalgos/tgba2ta.cc
@@ -94,7 +94,7 @@ namespace spot
                     && (!dest->is_accepting_state()) && (!dest_trans_empty))
                   transitions_to_livelock_states->push_front(*it_trans);
 
-                // optimization to have, after minimization, an unique
+                // optimization to have, after minimization, a unique
                 // livelock state which has no successors
                 if (dest->is_livelock_accepting_state() && (dest_trans_empty))
                   dest->set_accepting_state(false);
diff --git a/spot/taalgos/tgba2ta.hh b/spot/taalgos/tgba2ta.hh
index 397bae900..90112a42f 100644
--- a/spot/taalgos/tgba2ta.hh
+++ b/spot/taalgos/tgba2ta.hh
@@ -1,5 +1,5 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2010, 2012, 2013, 2014, 2015 Laboratoire de Recherche et
+// Copyright (C) 2010, 2012-2015, 2017 Laboratoire de Recherche et
 // Développement de l'Epita (LRDE).
 //
 // This file is part of Spot, a model checking library.
@@ -58,7 +58,7 @@ namespace spot
   /// for TA (spot::ta_check::check) can also be used to check GTA.
   ///
   /// \param artificial_initial_state_mode When set, the algorithm will build
-  /// a TA automaton with an unique initial state.  This
+  /// a TA automaton with a unique initial state.  This
   /// artificial initial state have one transition to each real initial state,
   /// and this transition is labeled by the corresponding initial condition.
   /// (see spot::ta::get_artificial_initial_state())
diff --git a/spot/twa/twagraph.cc b/spot/twa/twagraph.cc
index 52be23ea8..1cc83e5c1 100644
--- a/spot/twa/twagraph.cc
+++ b/spot/twa/twagraph.cc
@@ -466,7 +466,7 @@ namespace spot
         // calling graph::degrag_states() to finish with #1.  We clear
         // the "dests vector" of the current automaton, recreate all
         // the new destination groups using a univ_dest_mapper to
-        // simplify an unify them, and extend newst with some new
+        // simplify and unify them, and extend newst with some new
         // entries that will point the those new universal destination
         // so that graph::defrag_states() does not have to deal with
         // universal destination in any way.
diff --git a/spot/twaalgos/complement.hh b/spot/twaalgos/complement.hh
index 1508919ba..94dbe6b47 100644
--- a/spot/twaalgos/complement.hh
+++ b/spot/twaalgos/complement.hh
@@ -1,6 +1,6 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2013, 2014, 2015 Laboratoire de Recherche et Développement
-// de l'Epita.
+// Copyright (C) 2013-2015, 2017 Laboratoire de Recherche et
+// Développement de l'Epita.
 //
 // This file is part of Spot, a model checking library.
 //
@@ -35,7 +35,7 @@ namespace spot
   ///
   /// Functions like to_generalized_buchi() or remove_fin() are
   /// frequently called after dtwa_complement() to obtain an easier
-  /// acceptance condition (maybe at the cost of loosing determinism.)
+  /// acceptance condition (maybe at the cost of losing determinism.)
   SPOT_API twa_graph_ptr
   dtwa_complement(const const_twa_graph_ptr& aut);
 }
diff --git a/spot/twaalgos/sccinfo.cc b/spot/twaalgos/sccinfo.cc
index c15308403..1e5bc0108 100644
--- a/spot/twaalgos/sccinfo.cc
+++ b/spot/twaalgos/sccinfo.cc
@@ -182,7 +182,7 @@ namespace spot
             unsigned dest = e.dst;
             if ((int) dest < 0)
               {
-                // Iterate over all destinations of an universal edge.
+                // Iterate over all destinations of a universal edge.
                 if (todo_.top().univ_pos == 0)
                   todo_.top().univ_pos = ~dest + 1;
                 const auto& v = gr.dests_vector();
diff --git a/spot/twaalgos/sum.hh b/spot/twaalgos/sum.hh
index 34df70f8c..dcd0da1a2 100644
--- a/spot/twaalgos/sum.hh
+++ b/spot/twaalgos/sum.hh
@@ -48,7 +48,7 @@ namespace spot
                     unsigned left_state,
                     unsigned right_state);
 
-  /// \brief Sum two twa into a new twa, using an universal initial transition,
+  /// \brief Sum two twa into a new twa, using a universal initial transition,
   /// performing the intersection of the two languages of the input automatons.
   ///
   /// \param left Left term of the sum.
@@ -58,7 +58,7 @@ namespace spot
   twa_graph_ptr sum_and(const const_twa_graph_ptr& left,
                         const const_twa_graph_ptr& right);
 
-  /// \brief Sum two twa into a new twa, using an universal initial transition,
+  /// \brief Sum two twa into a new twa, using a universal initial transition,
   /// performing the intersection of the two languages of the input automatons.
   ///
   /// \param left Left term of the sum.
diff --git a/tests/sanity/style.test b/tests/sanity/style.test
index 9426c9571..94d4ff593 100755
--- a/tests/sanity/style.test
+++ b/tests/sanity/style.test
@@ -81,12 +81,11 @@ for dir in "$TOP/spot" "$TOP/bin" "$TOP/tests"; do
     fail=false
 
     # Check this before stripping comments and strings.
-    $GREP -i 'accepting cond' $file &&
-      diag 'accepting -> acceptance'
-
-    # Check this before stripping comments and strings.
-    $GREP -i 'dictionnar[yi]' $file &&
-      diag 'dictionnary -> dictionary'
+    $GREP -i 'accepting cond' $file && diag 'accepting -> acceptance'
+    $GREP -i 'dictionnar[yi]' $file && diag 'dictionnary -> dictionary'
+    # "an uninstalled" seems to be the exception so far, but we want
+    # "a unique", "a universal", etc.
+    $GREP -i 'an uni[^n]' $file && diag 'an uni... -> a uni...'
 
     $GREP -i 'version 2 of the License' $file &&
       diag 'license text should refer to version 2'