diff --git a/dev-blobserver b/dev-blobserver
index 6b05177b3..dd278b658 100755
--- a/dev-blobserver
+++ b/dev-blobserver
@@ -5,7 +5,7 @@ use FindBin;
 use Getopt::Long;
 
 sub usage {
-    die "Usage: dev-blobserver [--wipe] <portnumber> -- [other_camlistored_opts]";
+    die "Usage: dev-blobserver [--wipe] <portnumber> -- [other_blobserver_opts]";
 }
 
 my $opt_wipe;
@@ -29,7 +29,7 @@ unless (-d $root) {
 print "Starting blobserver on http://localhost:$port/ in $root\n";
 
 $ENV{CAMLI_PASSWORD} = "pass$port";
-exec("$FindBin::Bin/server/go/blobserver/camlistored",
+exec("$FindBin::Bin/server/go/blobserver/blobserver",
      "-root=$root",
      "-listen=:$port",
      @ARGV);
diff --git a/dev-indexer b/dev-indexer
index 51abe64b5..d84e89ea8 100755
--- a/dev-indexer
+++ b/dev-indexer
@@ -6,7 +6,7 @@ use Getopt::Long;
 use DBI;
 
 sub usage {
-    die "Usage: dev-indexer [--wipe] <portnumber> -- [other_camlistored_opts]";
+    die "Usage: dev-indexer [--wipe] <portnumber> -- [other_blobserver_opts]";
 }
 
 my $opt_wipe;
@@ -81,7 +81,7 @@ if ($opt_wipe) {
 print "Starting blobserver with indexer on http://localhost:$port/ in $root\n";
 
 $ENV{CAMLI_PASSWORD} = "pass$port";
-exec("$FindBin::Bin/server/go/blobserver/camlistored",
+exec("$FindBin::Bin/server/go/blobserver/blobserver",
      "-root=$root",  # NOTE: Root required but not used by indexer blobserver
      "-listen=:$port",
      "-devmysqlindexer",
diff --git a/server/go/sigserver/run.sh b/server/go/sigserver/run.sh
index 56bc66099..27a38b252 100755
--- a/server/go/sigserver/run.sh
+++ b/server/go/sigserver/run.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 export CAMLI_PASSWORD=test
-make && ./camsigd "$@"
+make && ./sigserver "$@"
diff --git a/server/go/sigserver/test/CamsigdTest.pm b/server/go/sigserver/test/CamsigdTest.pm
index ab6f51937..b238898d4 100644
--- a/server/go/sigserver/test/CamsigdTest.pm
+++ b/server/go/sigserver/test/CamsigdTest.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Common test library for camsigd
+# Common test library for camsigd (sigserver)
 
 package CamsigdTest;
 
@@ -11,7 +11,7 @@ use LWP::UserAgent;
 use HTTP::Request;
 use Fcntl;
 
-our $BINARY = "$FindBin::Bin/../camsigd";
+our $BINARY = "$FindBin::Bin/../sigserver";
 
 sub start {
     my ($port_rd, $port_wr, $exit_rd, $exit_wr);
diff --git a/server/tester/bs-test.pl b/server/tester/bs-test.pl
index 889327584..5fad55efe 100755
--- a/server/tester/bs-test.pl
+++ b/server/tester/bs-test.pl
@@ -290,7 +290,7 @@ sub start {
         and die "Failed to build Go blobserver.";
 
     my $bindir = "$FindBin::Bin/../go/blobserver/";
-    my $binary = "$bindir/camlistored";
+    my $binary = "$bindir/blobserver";
 
     chdir($bindir) or die "filed to chdir to $bindir: $!";
     system("make") and die "failed to run make in $bindir";
diff --git a/website/scripts/run-blobserver b/website/scripts/run-blobserver
index fd2144af6..16b9d9cbf 100755
--- a/website/scripts/run-blobserver
+++ b/website/scripts/run-blobserver
@@ -11,4 +11,4 @@ chmod 0700 $ROOT
 
 export CAMLI_PASSWORD=`cat $HOME/.camli/camorg-blobserver.pass`
 
-$Bin/../../build.pl server/go/blobserver && $Bin/../../server/go/blobserver/camlistored -root=$ROOT -listen=:3179 "$@"
+$Bin/../../build.pl server/go/blobserver && $Bin/../../server/go/blobserver/blobserver -root=$ROOT -listen=:3179 "$@"