diff --git a/server/server.go b/server/server.go
index 0aeb5dbc4..786947c81 100644
--- a/server/server.go
+++ b/server/server.go
@@ -102,10 +102,10 @@ func (s *Server) installV1() {
 }
 
 func (s *Server) installV2() {
-	s.handleFuncV2("/v2/keys/{key:.*}", v2.GetKeyHandler).Methods("GET")
-	s.handleFuncV2("/v2/keys/{key:.*}", v2.CreateKeyHandler).Methods("POST")
-	s.handleFuncV2("/v2/keys/{key:.*}", v2.UpdateKeyHandler).Methods("PUT")
-	s.handleFuncV2("/v2/keys/{key:.*}", v2.DeleteKeyHandler).Methods("DELETE")
+	s.handleFuncV2("/v2/keys/{key:.*}", v2.GetHandler).Methods("GET")
+	s.handleFuncV2("/v2/keys/{key:.*}", v2.PostHandler).Methods("POST")
+	s.handleFuncV2("/v2/keys/{key:.*}", v2.PutHandler).Methods("PUT")
+	s.handleFuncV2("/v2/keys/{key:.*}", v2.DeleteHandler).Methods("DELETE")
 	s.handleFunc("/v2/leader", s.GetLeaderHandler).Methods("GET")
 	s.handleFunc("/v2/machines", s.GetMachinesHandler).Methods("GET")
 	s.handleFunc("/v2/stats/self", s.GetStatsHandler).Methods("GET")
diff --git a/server/v2/delete_key_handler.go b/server/v2/delete_handler.go
similarity index 77%
rename from server/v2/delete_key_handler.go
rename to server/v2/delete_handler.go
index c53e72459..9012498cf 100644
--- a/server/v2/delete_key_handler.go
+++ b/server/v2/delete_handler.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func DeleteKeyHandler(w http.ResponseWriter, req *http.Request, s Server) error {
+func DeleteHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 	vars := mux.Vars(req)
 	key := "/" + vars["key"]
 
diff --git a/server/v2/get_key_handler.go b/server/v2/get_handler.go
similarity index 95%
rename from server/v2/get_key_handler.go
rename to server/v2/get_handler.go
index a7f8e56a1..d0e804273 100644
--- a/server/v2/get_key_handler.go
+++ b/server/v2/get_handler.go
@@ -13,7 +13,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func GetKeyHandler(w http.ResponseWriter, req *http.Request, s Server) error {
+func GetHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 	var err error
 	var event *store.Event
 
diff --git a/server/v2/create_key_handler.go b/server/v2/post_handler.go
similarity index 87%
rename from server/v2/create_key_handler.go
rename to server/v2/post_handler.go
index fab9bde1f..dda146e5e 100644
--- a/server/v2/create_key_handler.go
+++ b/server/v2/post_handler.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func CreateKeyHandler(w http.ResponseWriter, req *http.Request, s Server) error {
+func PostHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 	vars := mux.Vars(req)
 	key := "/" + vars["key"]
 
diff --git a/server/v2/update_key_handler.go b/server/v2/put_handler.go
similarity index 95%
rename from server/v2/update_key_handler.go
rename to server/v2/put_handler.go
index 60c260afc..6a5856f92 100644
--- a/server/v2/update_key_handler.go
+++ b/server/v2/put_handler.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func UpdateKeyHandler(w http.ResponseWriter, req *http.Request, s Server) error {
+func PutHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 	vars := mux.Vars(req)
 	key := "/" + vars["key"]