diff --git a/src/hydra-queue-runner/Makefile.am b/src/hydra-queue-runner/Makefile.am
index 21375f1c..9303d7d5 100644
--- a/src/hydra-queue-runner/Makefile.am
+++ b/src/hydra-queue-runner/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = hydra-queue-runner
 hydra_queue_runner_SOURCES = hydra-queue-runner.cc queue-monitor.cc dispatcher.cc \
  builder.cc build-result.cc build-remote.cc  \
  build-result.hh counter.hh pool.hh sync.hh token-server.hh state.hh db.hh \
- local-binary-cache.hh local-binary-cache.cc
+ binary-cache-store.hh binary-cache-store.cc
 hydra_queue_runner_LDADD = $(NIX_LIBS) -lpqxx
 
 AM_CXXFLAGS = $(NIX_CFLAGS) -Wall
diff --git a/src/hydra-queue-runner/local-binary-cache.cc b/src/hydra-queue-runner/binary-cache-store.cc
similarity index 99%
rename from src/hydra-queue-runner/local-binary-cache.cc
rename to src/hydra-queue-runner/binary-cache-store.cc
index 8b1d2431..e73cd00d 100644
--- a/src/hydra-queue-runner/local-binary-cache.cc
+++ b/src/hydra-queue-runner/binary-cache-store.cc
@@ -1,4 +1,4 @@
-#include "local-binary-cache.hh"
+#include "binary-cache-store.hh"
 
 #include "archive.hh"
 #include "compression.hh"
diff --git a/src/hydra-queue-runner/local-binary-cache.hh b/src/hydra-queue-runner/binary-cache-store.hh
similarity index 100%
rename from src/hydra-queue-runner/local-binary-cache.hh
rename to src/hydra-queue-runner/binary-cache-store.hh
diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc
index f3c7797b..ef68e484 100644
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@@ -7,7 +7,7 @@
 
 #include "state.hh"
 #include "build-result.hh"
-#include "local-binary-cache.hh"
+#include "binary-cache-store.hh"
 
 #include "shared.hh"
 #include "globals.hh"