diff --git a/mux.go b/mux.go
index 7fd4113..80ddaa6 100644
--- a/mux.go
+++ b/mux.go
@@ -170,7 +170,7 @@ func (mux *ServeMux) Handle(pattern string, handler Handler) {
 		panic("gemini: invalid pattern")
 	}
 	if handler == nil {
-		panic("gemini: nil responder")
+		panic("gemini: nil handler")
 	}
 	if _, exist := mux.m[pattern]; exist {
 		panic("gemini: multiple registrations for " + pattern)
@@ -204,7 +204,7 @@ func appendSorted(es []muxEntry, e muxEntry) []muxEntry {
 // HandleFunc registers the handler function for the given pattern.
 func (mux *ServeMux) HandleFunc(pattern string, handler func(ResponseWriter, *Request)) {
 	if handler == nil {
-		panic("gemini: nil responder")
+		panic("gemini: nil handler")
 	}
 	mux.Handle(pattern, HandlerFunc(handler))
 }
diff --git a/server.go b/server.go
index 38040f4..2e0c65e 100644
--- a/server.go
+++ b/server.go
@@ -78,7 +78,7 @@ func (srv *Server) Handle(pattern string, handler Handler) {
 		panic("gemini: invalid pattern")
 	}
 	if handler == nil {
-		panic("gemini: nil responder")
+		panic("gemini: nil handler")
 	}
 	if srv.handlers == nil {
 		srv.handlers = map[handlerKey]Handler{}
@@ -386,18 +386,18 @@ func (srv *Server) respond(conn net.Conn) {
 	// Store remote address
 	req.RemoteAddr = conn.RemoteAddr()
 
-	resp := srv.responder(req)
-	if resp == nil {
+	h := srv.handler(req)
+	if h == nil {
 		w.Status(StatusNotFound)
 		w.Flush()
 		return
 	}
 
-	resp.ServeGemini(w, req)
+	h.ServeGemini(w, req)
 	w.Flush()
 }
 
-func (srv *Server) responder(r *Request) Handler {
+func (srv *Server) handler(r *Request) Handler {
 	if h, ok := srv.handlers[handlerKey{r.URL.Scheme, r.URL.Hostname()}]; ok {
 		return h
 	}