diff --git a/server/announce_handler.go b/server/serve_announce.go
similarity index 100%
rename from server/announce_handler.go
rename to server/serve_announce.go
diff --git a/server/scrape_handler.go b/server/serve_scrape.go
similarity index 100%
rename from server/scrape_handler.go
rename to server/serve_scrape.go
diff --git a/server/stats_handler.go b/server/serve_stats.go
similarity index 100%
rename from server/stats_handler.go
rename to server/serve_stats.go
diff --git a/server/stats_handler_test.go b/server/serve_stats_test.go
similarity index 100%
rename from server/stats_handler_test.go
rename to server/serve_stats_test.go