diff --git a/doc/baselines.rst b/doc/baselines.rst
index ec91686e01bab0ecaaef674cf1c07b5f818d4828..fb08dc5201e358b426a5752066cf1b69891ca79c 100644
--- a/doc/baselines.rst
+++ b/doc/baselines.rst
@@ -119,13 +119,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "LBP features of facial region + SVM classifier + REPLAY-ATTACK database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 
 The EER/HTER errors for `replayattack`_ database are summarized in the Table below:
@@ -167,13 +167,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "IQM features of facial region + SVM classifier + REPLAY-ATTACK database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for `replayattack`_ database are summarized in the Table below:
 
@@ -214,13 +214,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "10 features for each window in Frame Differences + SVM classifier + REPLAY-ATTACK database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for `replayattack`_ database are summarized in the Table below:
 
@@ -270,13 +270,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "LBP features of facial region + SVM classifier + Replay-Mobile database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the `Replay-Mobile`_ database are summarized in the Table below:
 
@@ -318,13 +318,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "IQM features of facial region + SVM classifier + Replay-Mobile database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the `Replay-Mobile`_ database are summarized in the Table below:
 
@@ -366,13 +366,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "10 features for each window in Frame Differences + SVM classifier + Replay-Mobile database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the `Replay-Mobile`_ database are summarized in the Table below:
 
@@ -422,13 +422,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "LBP features of facial region + SVM classifier + MSU MFSD database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the `MSU MFSD`_ database are summarized in the Table below:
 
@@ -470,13 +470,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "IQM features of facial region + SVM classifier + MSU MFSD database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the `MSU MFSD`_ database are summarized in the Table below:
 
@@ -518,13 +518,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "10 features for each window in Frame Differences + SVM classifier + MSU MFSD database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the `MSU MFSD`_ database are summarized in the Table below:
 
@@ -576,13 +576,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "LBP features of facial region + SVM classifier + Aggregated database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the :ref:`bob.pad.face.resources.databases.aggregated_db` database are summarized in the Table below:
 
@@ -623,13 +623,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "IQM features of facial region + SVM classifier + Aggregated database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the :ref:`bob.pad.face.resources.databases.aggregated_db` database are summarized in the Table below:
 
@@ -670,13 +670,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "10 features for each window in Frame Differences + SVM classifier + Aggregated Db" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the :ref:`bob.pad.face.resources.databases.aggregated_db` database are summarized in the Table below:
 
@@ -718,13 +718,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "LBP features of facial region + SVM classifier + MIFS database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the MIFS database are summarized in the Table below:
 
@@ -752,13 +752,13 @@ following command:
 
 .. code-block:: sh
 
-    evaluate.py \
-    --dev-files  <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
-    --eval-files <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-dev  \
+    <PATH_TO_STORE_THE_RESULTS>/grandtest/scores/scores-eval \
     --legends "IQM features of facial region + SVM classifier + MIFS database" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the MIFS database are summarized in the Table below:
 
diff --git a/doc/other_pad_algorithms.rst b/doc/other_pad_algorithms.rst
index ac7efc11849958c9ad2a2881e70910325625206e..3a2a7fc17102b0edc2eb600cef70abd81a4d5584 100644
--- a/doc/other_pad_algorithms.rst
+++ b/doc/other_pad_algorithms.rst
@@ -142,25 +142,16 @@ following command:
 
 .. code-block:: sh
 
-    ./bin/evaluate.py \
-    --dev-files \
-    <PATH_TO_STORE_THE_RESULTS_1>/grandtest/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_2>/grandtest/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_3>/grandtest/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_4>/grandtest/scores/scores-dev  \
-    --eval-files \
-    <PATH_TO_STORE_THE_RESULTS_1>/grandtest/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_2>/grandtest/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_3>/grandtest/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_4>/grandtest/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS_{1,2,3,4}>/grandtest/scores/scores-{dev,eval} \
     --legends \
     "IQM + one-class GMM + Aggregated Db" \
     "IQM + one-class SVM + Aggregated Db" \
     "IQM + two-class LR  + Aggregated Db" \
     "IQM + two-class SVM + Aggregated Db" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --c eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the :ref:`bob.pad.face.resources.databases.aggregated_db` database are summarized in the Table below:
 
@@ -231,25 +222,16 @@ following command:
 
 .. code-block:: sh
 
-    ./bin/evaluate.py \
-    --dev-files \
-    <PATH_TO_STORE_THE_RESULTS_1>/photo-photo-video/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_2>/photo-photo-video/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_3>/photo-photo-video/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_4>/photo-photo-video/scores/scores-dev  \
-    --eval-files \
-    <PATH_TO_STORE_THE_RESULTS_1>/photo-photo-video/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_2>/photo-photo-video/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_3>/photo-photo-video/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_4>/photo-photo-video/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS_{1,2,3,4}>/photo-photo-video/scores/scores-{dev,eval}  \
     --legends \
     "IQM + one-class GMM + Aggregated Db" \
     "IQM + one-class SVM + Aggregated Db" \
     "IQM + two-class LR  + Aggregated Db" \
     "IQM + two-class SVM + Aggregated Db" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the :ref:`bob.pad.face.resources.databases.aggregated_db` database are summarized in the Table below:
 
@@ -320,25 +302,16 @@ following command:
 
 .. code-block:: sh
 
-    ./bin/evaluate.py \
-    --dev-files \
-    <PATH_TO_STORE_THE_RESULTS_1>/video-video-photo/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_2>/video-video-photo/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_3>/video-video-photo/scores/scores-dev  \
-    <PATH_TO_STORE_THE_RESULTS_4>/video-video-photo/scores/scores-dev  \
-    --eval-files \
-    <PATH_TO_STORE_THE_RESULTS_1>/video-video-photo/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_2>/video-video-photo/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_3>/video-video-photo/scores/scores-eval \
-    <PATH_TO_STORE_THE_RESULTS_4>/video-video-photo/scores/scores-eval \
+    bob pad evaluate \
+    <PATH_TO_STORE_THE_RESULTS_{1,2,3,4}>/video-video-photo/scores/scores-{dev,eval}  \
     --legends \
     "IQM + one-class GMM + Aggregated Db" \
     "IQM + one-class SVM + Aggregated Db" \
     "IQM + two-class LR  + Aggregated Db" \
     "IQM + two-class SVM + Aggregated Db" \
-    -F 7 \
-    --criterion EER \
-    --roc <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
+    -e \
+    --criterion eer \
+    -o <PATH_TO_STORE_THE_RESULTS>/ROC.pdf
 
 The EER/HTER errors for the :ref:`bob.pad.face.resources.databases.aggregated_db` database are summarized in the Table below: