diff --git a/src/c/Makefile.am b/src/c/Makefile.am
index 52e8dbbd..fea30f65 100644
--- a/src/c/Makefile.am
+++ b/src/c/Makefile.am
@@ -1,6 +1,6 @@
-bin_PROGRAMS = hydra_eval_jobs
+bin_PROGRAMS = hydra-eval-jobs
 
-hydra_eval_jobs_SOURCES = hydra_eval_jobs.cc
+hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc
 hydra_eval_jobs_LDADD = -lmain -lexpr -L$(nix)/lib/nix $(BDW_GC_LIBS)
 
 AM_CXXFLAGS =					\
diff --git a/src/c/hydra_eval_jobs.cc b/src/c/hydra-eval-jobs.cc
similarity index 100%
rename from src/c/hydra_eval_jobs.cc
rename to src/c/hydra-eval-jobs.cc
diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index ae5f0908..988ca52e 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -655,7 +655,7 @@ sub evalJobs {
     my $nixExprFullPath = $nixExprInput->{storePath} . "/" . $nixExprPath;
     
     (my $res, my $jobsXml, my $stderr) = captureStdoutStderr(10800,
-        ("hydra_eval_jobs", $nixExprFullPath, "--gc-roots-dir", getGCRootsDir, "-j", 1, inputsToArgs($inputInfo)));
+        ("hydra-eval-jobs", $nixExprFullPath, "--gc-roots-dir", getGCRootsDir, "-j", 1, inputsToArgs($inputInfo)));
     die "Cannot evaluate the Nix expression containing the jobs:\n$stderr" unless $res;
 
     print STDERR "$stderr";
diff --git a/src/script/hydra-evaluator b/src/script/hydra-evaluator
index 9e7371c7..8c781e30 100755
--- a/src/script/hydra-evaluator
+++ b/src/script/hydra-evaluator
@@ -109,7 +109,7 @@ sub checkJobset {
     fetchInputs($project, $jobset, $inputInfo);
     my $checkoutStop = time;
 
-    # Hash the arguments to hydra_eval_jobs and check the
+    # Hash the arguments to hydra-eval-jobs and check the
     # JobsetInputHashes to see if we've already evaluated this set of
     # inputs.  If so, bail out.
     my @args = ($jobset->nixexprinput, $jobset->nixexprpath, inputsToArgs($inputInfo));
diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index 75402c13..5d418800 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -457,7 +457,7 @@ create table JobsetEvals (
     -- the current inputs for a jobset, we hash the inputs together,
     -- and if the resulting hash already appears in this table, we can
     -- skip the jobset.  Otherwise we proceed.  The hash is computed
-    -- over the command-line arguments to hydra_eval_jobs.
+    -- over the command-line arguments to hydra-eval-jobs.
     hash          text not null,
 
     foreign key   (project) references Projects(name) on delete cascade on update cascade,