diff --git a/doc/dev-notes.txt b/doc/dev-notes.txt
index 96b41b27..b2ba692e 100644
--- a/doc/dev-notes.txt
+++ b/doc/dev-notes.txt
@@ -161,7 +161,7 @@
 
 * Using PostgreSQL:
 
-  $ HYDRA_DBI="dbi:Pg:dbname=hydra;" hydra_server.pl
+  $ HYDRA_DBI="dbi:Pg:dbname=hydra;" hydra-server
 
 
 * Find the builds with the highest number of build steps:
diff --git a/release.nix b/release.nix
index 59da8330..b8862cc6 100644
--- a/release.nix
+++ b/release.nix
@@ -119,7 +119,7 @@ rec {
                 );
 
             # Start the web interface.
-            #$machine->mustSucceed("HYDRA_DATA=/var/lib/hydra HYDRA_DBI='dbi:Pg:dbname=hydra;user=hydra;' hydra_server.pl >&2 &");
+            #$machine->mustSucceed("HYDRA_DATA=/var/lib/hydra HYDRA_DBI='dbi:Pg:dbname=hydra;user=hydra;' hydra-server >&2 &");
             #$machine->waitForOpenPort("3000");
           '';
           
diff --git a/src/lib/Hydra/Controller/Admin.pm b/src/lib/Hydra/Controller/Admin.pm
index 11b9755a..02d0f9bc 100644
--- a/src/lib/Hydra/Controller/Admin.pm
+++ b/src/lib/Hydra/Controller/Admin.pm
@@ -365,7 +365,7 @@ sub force_eval : Chained('admin') Path('eval') Args(2) {
     $c->stash->{jobset} = $c->stash->{jobset_}->single
         or notFound($c, "Jobset $jobsetName doesn't exist.");
 
-    (my $res, my $stdout, my $stderr) = captureStdoutStderr(60, ("hydra_evaluator.pl", $projectName, $jobsetName));
+    (my $res, my $stdout, my $stderr) = captureStdoutStderr(60, ("hydra-evaluator", $projectName, $jobsetName));
 
     $c->res->redirect("/project/$projectName");
 }
diff --git a/src/script/hydra-control b/src/script/hydra-control
index 0fdc69b2..1299c4e4 100755
--- a/src/script/hydra-control
+++ b/src/script/hydra-control
@@ -9,13 +9,13 @@ fi
 
 if test "$action" = "start"; then
 
-    hydra_server.pl > $HYDRA_DATA/server.log 2>&1 &
+    hydra-server > $HYDRA_DATA/server.log 2>&1 &
     echo $! > $HYDRA_DATA/server.pid
 
-    hydra_evaluator.pl > $HYDRA_DATA/evaluator.log 2>&1 &
+    hydra-evaluator > $HYDRA_DATA/evaluator.log 2>&1 &
     echo $! > $HYDRA_DATA/evaluator.pid
 
-    hydra_queue_runner.pl > $HYDRA_DATA/queue_runner.log 2>&1 &
+    hydra-queue-runner > $HYDRA_DATA/queue-runner.log 2>&1 &
     echo $! > $HYDRA_DATA/queue_runner.pid
 
 elif test "$action" = "stop"; then