diff --git a/bob/bio/base/test/test_commands.py b/bob/bio/base/test/test_commands.py
index 7c4a9984678f8fd6ed6c160527d53357435c1c6d..32366e1933578f8b6acb08ce16848485c698e82b 100644
--- a/bob/bio/base/test/test_commands.py
+++ b/bob/bio/base/test/test_commands.py
@@ -244,7 +244,7 @@ def test_hist():
     with runner.isolated_filesystem():
         result = runner.invoke(commands.hist, ['--criterion', 'min-hter', '--output',
                                                'HISTO.pdf', '-b',
-                                               'doane', dev1, dev2])
+                                               '30,auto,30,doane', dev1, dev2])
         if result.output:
             click.echo(result.output)
         assert result.exit_code == 0, (result.exit_code, result.output)
diff --git a/doc/more.rst b/doc/more.rst
index 089da351bd84cca9008ea6e22ba893ac11e43319..952672d94ebb450e1b131a55fb0aeaa9ffef5621 100644
--- a/doc/more.rst
+++ b/doc/more.rst
@@ -75,7 +75,7 @@ If ``--eval-files`` are specified, the same fusion that is trained on the develo
 .. note::
    When ``--eval-files`` are specified, they need to be in the same order as the ``--dev-files``, otherwise the result is undefined.
 
-The resulting ``--fused-dev-file`` and ``--fused-eval-file`` can then be evaluated normally, e.g., using the ``evaluate.py`` script.
+The resulting ``--fused-dev-file`` and ``--fused-eval-file`` can then be evaluated normally, e.g., using the ``bob bio evaluate`` script.
 
 
 .. _grid-search:
diff --git a/doc/struct_bio_rec_sys.rst b/doc/struct_bio_rec_sys.rst
index 2c81a81ae2ee59a76197bc5f8d298825813d3c4b..0867f432dd862778e172a873a664ce2c87bfabb3 100644
--- a/doc/struct_bio_rec_sys.rst
+++ b/doc/struct_bio_rec_sys.rst
@@ -136,7 +136,7 @@ Once a decision has been made, we can quantify the overall performance of the pa
 
 .. note::
 
-   * The "Data Preprocessing" to "Matching" steps are carried out by ``bob.bio.base``'s ``verify.py`` script.  The "Decision Making" step is carried out by ``bob.bio.base``'s ``evaluate.py`` script.  These scripts will be discussed in the next sections.
+   * The "Data Preprocessing" to "Matching" steps are carried out by ``bob.bio.base``'s ``verify.py`` script.  The "Decision Making" step is carried out by ``bob.bio.base``'s ``bob bio evaluate`` script.  These scripts will be discussed in the next sections.
    * The communication between any two steps in the recognition framework is file-based, usually using a binary HDF5_ interface, which is implemented, for example, in the :py:class:`bob.io.base.HDF5File` class. One exception is the "Decision Making" step, which uses score file in text format, i.e., to allow to incorporate other systems' results, which are computed outside of ``bob.bio``, but uses the same database and evaluation protocol.
    * The output of one step usually serves as the input of the subsequent step(s), as portrayed in Fig. 3 -- Fig. 8.
    * ``bob.bio`` ensures that the correct files are always forwarded to the subsequent steps.  For example, if you choose to implement a feature projection after the feature extraction stage, as illustrated in Fig. 5, ``bob.bio`` will make sure that the files in the "projected" directory are passed on as the input to the Enrollment stage; otherwise, the "extracted" directory will become the input to the Enrollment stage.