diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am
index 5511b2c8e..013d7ff77 100644
--- a/src/nix-env/Makefile.am
+++ b/src/nix-env/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = nix-env
 
-nix_env_SOURCES = main.cc names.cc names.hh \
+nix_env_SOURCES = nix-env.cc names.cc names.hh \
  profiles.cc profiles.hh help.txt
 nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
  ../libstore/libstore.la ../libutil/libutil.la \
diff --git a/src/nix-env/main.cc b/src/nix-env/nix-env.cc
similarity index 100%
rename from src/nix-env/main.cc
rename to src/nix-env/nix-env.cc
diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am
index d1a87986f..d4f8b4cca 100644
--- a/src/nix-instantiate/Makefile.am
+++ b/src/nix-instantiate/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = nix-instantiate
 
-nix_instantiate_SOURCES = main.cc help.txt
+nix_instantiate_SOURCES = nix-instantiate.cc help.txt
 nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
  ../libstore/libstore.la ../libutil/libutil.la \
  ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}
diff --git a/src/nix-instantiate/main.cc b/src/nix-instantiate/nix-instantiate.cc
similarity index 100%
rename from src/nix-instantiate/main.cc
rename to src/nix-instantiate/nix-instantiate.cc
diff --git a/src/nix-setuid-helper/Makefile.am b/src/nix-setuid-helper/Makefile.am
index afff2bde7..a0fbdf39d 100644
--- a/src/nix-setuid-helper/Makefile.am
+++ b/src/nix-setuid-helper/Makefile.am
@@ -1,6 +1,6 @@
 libexec_PROGRAMS = nix-setuid-helper
 
-nix_setuid_helper_SOURCES = main.cc
+nix_setuid_helper_SOURCES = nix-setuid-helper.cc
 nix_setuid_helper_LDADD = ../libutil/libutil.la \
  ../boost/format/libformat.la ${aterm_lib}
 
diff --git a/src/nix-setuid-helper/main.cc b/src/nix-setuid-helper/nix-setuid-helper.cc
similarity index 100%
rename from src/nix-setuid-helper/main.cc
rename to src/nix-setuid-helper/nix-setuid-helper.cc
diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am
index 83fa24fca..b96b8dc36 100644
--- a/src/nix-store/Makefile.am
+++ b/src/nix-store/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = nix-store
 
-nix_store_SOURCES = main.cc dotgraph.cc dotgraph.hh help.txt
+nix_store_SOURCES = nix-store.cc dotgraph.cc dotgraph.hh help.txt
 nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
  ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}
 
diff --git a/src/nix-store/main.cc b/src/nix-store/nix-store.cc
similarity index 100%
rename from src/nix-store/main.cc
rename to src/nix-store/nix-store.cc
diff --git a/src/nix-worker/Makefile.am b/src/nix-worker/Makefile.am
index 1be7e3d54..6c537a3f9 100644
--- a/src/nix-worker/Makefile.am
+++ b/src/nix-worker/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = nix-worker
 
-nix_worker_SOURCES = main.cc help.txt
+nix_worker_SOURCES = nix-worker.cc help.txt
 nix_worker_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
  ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}
 
diff --git a/src/nix-worker/main.cc b/src/nix-worker/nix-worker.cc
similarity index 100%
rename from src/nix-worker/main.cc
rename to src/nix-worker/nix-worker.cc