diff --git a/simple-udp-service.rkt b/simple-udp-service.rkt
index ed04cf8..831eb0f 100644
--- a/simple-udp-service.rkt
+++ b/simple-udp-service.rkt
@@ -20,7 +20,7 @@
 ;; TODO: Should parse-packet be permitted to examine (or possibly
 ;; even transform!) the ServerState?
 
-;; A Handler is a ClassifiedPacket ServerState -> ListOf<ClassifiedPacket> ServerState.
+;; A Handler is a Message ServerState -> ListOf<Message> ServerState.
 
 (define-syntax event-handlers
   (syntax-rules ()
@@ -34,12 +34,12 @@
 ;; Starts a generic request/reply UDP server on the given port.
 (define (start-udp-service
 	 port-number ;; Uint16
-	 parse-packet ;; UdpPacket -> ClassifiedPacket
+	 parse-packet ;; UdpPacket -> Message
 	 ;--------------------------------------------------
-	 unparse-packet? ;; ClassifiedPacket -> Boolean
-	 unparse-packet ;; ClassifiedPacket -> UdpPacket
+	 unparse-packet? ;; Message -> Boolean
+	 unparse-packet ;; Message -> UdpPacket
 	 ;--------------------------------------------------
-	 event-handlers ;; ListOf<Pair<ClassifiedPacket -> Boolean, Handler>>
+	 event-handlers ;; ListOf<Pair<Message -> Boolean, Handler>>
 	 default-handler ;; Handler
 	 initial-state ;; ServerState
 	 #:packet-size-limit