diff --git a/bob/bio/base/script/commands.py b/bob/bio/base/script/commands.py
index 8dd82acacb202864d5c6c2fddf8e3be76bc727fe..99d58f628e8fe87951b485d90cf76da9e76a8e6a 100644
--- a/bob/bio/base/script/commands.py
+++ b/bob/bio/base/script/commands.py
@@ -302,7 +302,7 @@ def hist(ctx, scores, evaluation, **kwargs):
         $ bob bio hist dev-scores1 eval-scores1 dev-scores2
         eval-scores2
 
-        $ bob bio hist --criter --show-dev hter dev-scores1 eval-scores1
+        $ bob bio hist --criterion --show-dev hter dev-scores1 eval-scores1
     """
     process = bio_figure.Hist(ctx, scores, evaluation, load.split)
     process.run()
diff --git a/bob/bio/base/test/test_commands.py b/bob/bio/base/test/test_commands.py
index a685417ef1d871d7b608a6f66a68883fe8b44b78..22f01ebe4c0901ed108a8a530ccf6d6f453e46fa 100644
--- a/bob/bio/base/test/test_commands.py
+++ b/bob/bio/base/test/test_commands.py
@@ -45,7 +45,7 @@ def test_metrics():
     with runner.isolated_filesystem():
         result = runner.invoke(
             commands.metrics, ['-l', 'tmp', '-T', '0.1',
-                               '--criter', 'mindcf', '--cost', 0.9,
+                               '--criterion', 'mindcf', '--cost', 0.9,
                                dev1, test2]
         )
         assert result.exit_code == 0, (result.exit_code, result.output)
@@ -53,34 +53,34 @@ def test_metrics():
     with runner.isolated_filesystem():
         result = runner.invoke(
             commands.metrics, ['--no-evaluation', '-l', 'tmp',
-                               '--criter', 'mindcf', '--cost', 0.9,
+                               '--criterion', 'mindcf', '--cost', 0.9,
                                dev1]
         )
         assert result.exit_code == 0, (result.exit_code, result.output)
 
     with runner.isolated_filesystem():
         result = runner.invoke(
-            commands.metrics, ['--criter', 'cllr', dev1, test2]
+            commands.metrics, ['--criterion', 'cllr', dev1, test2]
         )
         assert result.exit_code == 0, (result.exit_code, result.output)
 
     with runner.isolated_filesystem():
         result = runner.invoke(
-            commands.metrics, ['--no-evaluation', '-l', 'tmp', '--criter', 'cllr',
+            commands.metrics, ['--no-evaluation', '-l', 'tmp', '--criterion', 'cllr',
                                '--cost', 0.9, dev1]
         )
         assert result.exit_code == 0, (result.exit_code, result.output)
 
     with runner.isolated_filesystem():
         result = runner.invoke(
-            commands.metrics, ['--criter', 'rr', '-T',
+            commands.metrics, ['--criterion', 'rr', '-T',
                                '0.1', dev1, test2]
         )
         assert result.exit_code == 0, (result.exit_code, result.output)
 
     with runner.isolated_filesystem():
         result = runner.invoke(
-            commands.metrics, ['--no-evaluation', '-l', 'tmp', '--criter', 'rr',
+            commands.metrics, ['--no-evaluation', '-l', 'tmp', '--criterion', 'rr',
                                dev1, dev2]
         )
         assert result.exit_code == 0, (result.exit_code, result.output)
@@ -189,7 +189,7 @@ def test_hist():
         assert result.exit_code == 0, (result.exit_code, result.output)
 
     with runner.isolated_filesystem():
-        result = runner.invoke(commands.hist, ['--criter', 'hter', '--output',
+        result = runner.invoke(commands.hist, ['--criterion', 'hter', '--output',
                                                'HISTO.pdf', '-b',
                                                30,'--no-evaluation', dev1, dev2])
         if result.output:
@@ -197,7 +197,7 @@ def test_hist():
         assert result.exit_code == 0, (result.exit_code, result.output)
 
     with runner.isolated_filesystem():
-        result = runner.invoke(commands.hist, ['--criter', 'eer', '--output',
+        result = runner.invoke(commands.hist, ['--criterion', 'eer', '--output',
                                                'HISTO.pdf', '-b', 30,
                                                '-ts', 'A,B', dev1, test1, dev2,
                                                test2])
diff --git a/doc/experiments.rst b/doc/experiments.rst
index 2b3171a039a1d0caef2bb1208e5032b5c3d69485..8a41322eea4a3164cb78ce69d5d70ffd4848e4ae 100644
--- a/doc/experiments.rst
+++ b/doc/experiments.rst
@@ -170,7 +170,7 @@ min.HTER) on a development set and apply it on an evaluation set, just do:
 
 .. code-block:: sh
 
-    $ bob bio metrics {dev,test}-4col.txt --titltes ExpA --criter hter
+    $ bob bio metrics {dev,test}-4col.txt --titltes ExpA --criterion hter
 
     [Min. criterion: HTER ] Threshold on Development set `ExpA`: -4.830500e-03
     ======  ======================  =================
@@ -194,7 +194,7 @@ For example:
 
 .. code-block:: sh
 
-    bob bio metrics {dev,test}-4col.txt --titltes ExpA --criter cllr
+    bob bio metrics {dev,test}-4col.txt --titltes ExpA --criterion cllr
 
     ======  ======================  ================
     Computing  Cllr and minCllr...