diff --git a/docker/services/swh-journal-backfiller/entrypoint.sh b/docker/services/swh-journal-backfiller/entrypoint.sh
index d24bf1b..d15d9eb 100755
--- a/docker/services/swh-journal-backfiller/entrypoint.sh
+++ b/docker/services/swh-journal-backfiller/entrypoint.sh
@@ -1,19 +1,19 @@
 #!/bin/bash
 
 set -e
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       wait_pgsql
-      echo "Starting swh-journal-backfiller"
-      exec wait-for-it kafka:9092 -s --timeout=0 -- swh-journal backfiller $@
+      echo "Starting swh-storage-backfiller"
+      exec wait-for-it kafka:9092 -s --timeout=0 -- swh storage backfill $@
       ;;
 esac
diff --git a/docker/services/swh-storage-replayer/entrypoint.sh b/docker/services/swh-storage-replayer/entrypoint.sh
index 74f1e6b..6623860 100755
--- a/docker/services/swh-storage-replayer/entrypoint.sh
+++ b/docker/services/swh-storage-replayer/entrypoint.sh
@@ -1,28 +1,28 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       wait_pgsql
 
       echo Setup the database
       PGPASSWORD=${POSTGRES_PASSWORD} swh db-init \
           --db-name ${POSTGRES_DB} storage
 
       echo Starting the swh-storage Kafka storage replayer
-      exec swh journal replay \
+      exec swh storage replay \
 		   --broker kafka \
 		   --prefix swh.journal.objects \
 		   --consumer-id swh.storage.mirror
       ;;
 esac