diff --git a/scheme/lib/pop3.scm b/scheme/lib/pop3.scm
index 2cd68e2..1539cc5 100644
--- a/scheme/lib/pop3.scm
+++ b/scheme/lib/pop3.scm
@@ -159,8 +159,8 @@
     (values (string->number (match:substring match 1))
             (string->number (match:substring match 2)))))
 
-(define (pop3-get connection msgid)
-  (check-transaction-state connection pop3-get)
+(define (pop3-retrieve-message connection msgid)
+  (check-transaction-state connection pop3-retrieve-message)
   (let* ((status (send-command connection
 			       (build-command "RETR" (number->string msgid))))
 	 (port (socket:inport (pop3-connection-command-socket connection)))
@@ -168,8 +168,8 @@
 	 (body (multiline-response->lines port)))
     (values headers body)))
 
-(define (pop3-headers connection msgid)
-  (check-transaction-state connection pop3-headers)
+(define (pop3-retrieve-headers connection msgid)
+  (check-transaction-state connection pop3-retrieve-headers)
   (let* ((status (send-command connection
 			       (build-command "TOP" (number->string msgid) "0")))
 	 (port (socket:inport (pop3-connection-command-socket connection)))
diff --git a/scheme/packages.scm b/scheme/packages.scm
index c5b49cb..ec03d0e 100644
--- a/scheme/packages.scm
+++ b/scheme/packages.scm
@@ -124,12 +124,13 @@
 (define-interface pop3-interface
   (export pop3-connect
           pop3-stat
-          pop3-get
-          pop3-headers
+          pop3-retrieve-message
+          pop3-retrieve-headers
           pop3-last
           pop3-delete
           pop3-reset
-          pop3-quit))
+          pop3-quit
+	  pop3-error?))
 
 (define-interface nettime-interface
   (export net-time
@@ -438,7 +439,7 @@
 
 (define-structure pop3 pop3-interface
   (open scheme-with-scsh
-	netrc
+	netrc rfc822
         define-record-types
         handle
         conditions handle-fatal-error