The great name change.

svn path=/trunk/; revision=114

24 files changed, 231 insertions, 220 deletions

diff --git a/INSTALL b/INSTALL
index 7d590f35..c826a584 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-		INSTALL Instructions for Popclient
+		INSTALL Instructions for Fetchmail
 
-Installing popclient is easy.  From within this directory, type:
+Installing fetchmail is easy.  From within this directory, type:
 
 	./configure
 
@@ -17,14 +17,14 @@ Next run
 
 	make
 
-This will compile popclient for your system.  Note that in order to
+This will compile fetchmail for your system.  Note that in order to
 build it, you'll need either flex at version 2.5.3 org greater, or lex.
 
 Lastly, become root and run
 
 	make install
 
-This will install popclient.  By default, popclient will be installed
+This will install fetchmail.  By default, fetchmail will be installed
 in /usr/local/bin, with the man page in /usr/local/man/man1, and the
 GNU info file in /usr/local/info.  If you wish to change these defaults,
 edit the Makefile AFTER you run "configure" but BEFORE you run 
diff --git a/Makefile.in b/Makefile.in
index a21d1adc..d77372a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile for popclient
+# Makefile for fetchmail
 
 # If you're running QNX, we can't assume a working autoconf.
 # So just uncomment all the lines marked QNX.
 
-VERS=3.2
+VERS=1.0
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@
@@ -44,8 +44,8 @@ prefix = /usr/local
 # Common prefix for machine-dependent installed files.
 exec_prefix = $(prefix)
 
-# Name under which to install popclient
-instname = popclient
+# Name under which to install fetchmail
+instname = fetchmail
 # Directory in which to install.
 bindir = $(exec_prefix)/bin
 # Directory to install the Info files in.
@@ -71,33 +71,33 @@ TEXI2DVI = texi2dvi
 ETAGS = etags -tw
 CTAGS = ctags -tw
 
-popobjs = socket.o getpass.o pop2.o pop3.o imap.o popclient.o options.o	\
-       poprc_l.o poprc_y.o poprc.o daemon.o driver.o smtp.o xmalloc.o
+popobjs = socket.o getpass.o pop2.o pop3.o imap.o fetchmail.o options.o	\
+       fetchrc_l.o fetchrc_y.o fetchrc.o daemon.o driver.o smtp.o xmalloc.o
 
 objs = $(popobjs) $(EXTRAOBJ) $(extras)
 
 srcs = $(srcdir)/socket.c $(srcdir)/getpass.c $(srcdir)/pop2.c 		\
-       $(srcdir)/pop3.c $(srcdir)/imap.c $(srcdir)/popclient.c		\
-       $(srcdir)/options.c $(srcdir)/poprc.c $(srcdir)/daemon.c 	\
+       $(srcdir)/pop3.c $(srcdir)/imap.c $(srcdir)/fetchmail.c		\
+       $(srcdir)/options.c $(srcdir)/fetchrc.c $(srcdir)/daemon.c 	\
        $(srcdir)/driver.c $(srcdir)/smtp.c $(srcdir)/xmalloc.c $(EXTRASRC)
 
 .SUFFIXES:
 .SUFFIXES: .o .c .h .y .l .ps .dvi .info .texi
 
-all: popclient
+all: fetchmail
 check: # No tests.
 depend:
 	test -f config.h || touch config.h
-	test -f poprc_y.h || touch poprc_y.h
+	test -f fetchrc_y.h || touch fetchrc_y.h
 	makedepend -fMakefile.in *.c
 
 # Some makes apparently use .PHONY as the default goal is it is before `all'.
 .PHONY: all check
 
-$(popobjs): popclient.h
+$(popobjs): fetchmail.h
 
-popclient: $(srcdir)/poprc_l.c $(srcdir)/poprc_y.c $(objs)
-	$(CC) $(LDFLAGS) $(objs) $(LOADLIBS) -o popclient
+fetchmail: $(srcdir)/fetchrc_l.c $(srcdir)/fetchrc_y.c $(objs)
+	$(CC) $(LDFLAGS) $(objs) $(LOADLIBS) -o fetchmail
 
 
 # -I. is needed to find config.h in the build directory.
@@ -125,7 +125,7 @@ MAKE = make
 
 FORCE:
 
-tagsrcs = $(srcs) $(srcdir)/poprc_l.c $(srcdir)/poprc_y.c
+tagsrcs = $(srcs) $(srcdir)/fetchrc_l.c $(srcdir)/fetchrc_y.c
 TAGS: $(tagsrcs)
 	$(ETAGS) $(tagsrcs)
 tags: $(tagsrcs)
@@ -133,21 +133,21 @@ tags: $(tagsrcs)
 
 .PHONY: install installdirs
 install: installdirs \
-	 $(bindir)/$(instname) # $(infodir)/popclient.info \
+	 $(bindir)/$(instname) # $(infodir)/fetchmail.info \
 	 $(mandir)/$(instname).$(manext)
 
 installdirs:
 	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(mandir)
 
-$(bindir)/$(instname): popclient
-	$(INSTALL_PROGRAM) popclient $@
+$(bindir)/$(instname): fetchmail
+	$(INSTALL_PROGRAM) fetchmail $@
 
-$(infodir)/popclient.info: popclient.info
-	if [ -r ./popclient.info ]; then dir=.; else dir=$(srcdir); fi; \
-	for file in $${dir}/popclient.info*; do \
+$(infodir)/fetchmail.info: fetchmail.info
+	if [ -r ./fetchmail.info ]; then dir=.; else dir=$(srcdir); fi; \
+	for file in $${dir}/fetchmail.info*; do \
 	  name="`basename $$file`"; \
 	  $(INSTALL_DATA) $$file \
-	    `echo $@ | sed "s,popclient.info\$$,$$name,"`; \
+	    `echo $@ | sed "s,fetchmail.info\$$,$$name,"`; \
 	done
 # Run install-info only if it exists.
 # Use `if' instead of just prepending `-' to the
@@ -155,25 +155,25 @@ $(infodir)/popclient.info: popclient.info
 # We use `$(SHELL) -c' because some shells do not
 # fail gracefully when there is an unknown command.
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --infodir=$(infodir) $$dir/popclient.info; \
+	  install-info --infodir=$(infodir) $$dir/fetchmail.info; \
 	else true; fi
 
-$(mandir)/$(instname).$(manext): popclient.man
-	$(INSTALL_DATA) $(srcdir)/popclient.man $@
+$(mandir)/$(instname).$(manext): fetchmail.man
+	$(INSTALL_DATA) $(srcdir)/fetchmail.man $@
 
 
 .PHONY: clean realclean distclean mostlyclean
 clean: 
-	-rm -f popclient *.o core popclient.dvi \
-	       poprc_l.c poprc_y.h poprc_y.c popclient.tar popclient.tar.gz
+	-rm -f fetchmail *.o core fetchmail.dvi \
+	       fetchrc_l.c fetchrc_y.h fetchrc_y.c fetchmail.tar fetchmail.tar.gz
 
 distclean: clean 
 	-rm -f Makefile config.h
 	-rm -f config.cache config.status config.log stamp-config
 	-rm -f TAGS tags
-	-rm -f popclient.log popclient.toc popclient.*aux
+	-rm -f fetchmail.log fetchmail.toc fetchmail.*aux
 
-realclean: popclient.info* distclean
+realclean: fetchmail.info* distclean
 
 mostlyclean: clean
 
@@ -194,31 +194,31 @@ configure: configure.in
 
 
 # Special dependencies, not easily handled without explicit rules
-$(srcdir)/poprc_l.c: $(srcdir)/poprc_l.l
-$(srcdir)/poprc_y.c: $(srcdir)/poprc_y.y
+$(srcdir)/fetchrc_l.c: $(srcdir)/fetchrc_l.l
+$(srcdir)/fetchrc_y.c: $(srcdir)/fetchrc_y.y
 
-parser = $(srcdir)/poprc_l.l $(srcdir)/poprc_y.y
-headers = $(srcdir)/popclient.h $(srcdir)/socket.h $(srcdir)/poproto.h \
+parser = $(srcdir)/fetchrc_l.l $(srcdir)/fetchrc_y.y
+headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/poproto.h \
 	$(srcdir)/smtp.h
 extra = $(srcdir)/alloca.c $(srcdir)/bzero.[ch] $(srcdir)/errorcodes \
 	$(srcdir)/getopt.[ch] $(srcdir)/getopt1.c $(srcdir)/md5*.[ch] \
 	$(srcdir)/strcasecmp.c $(srcdir)/strdup.c
 docs = $(srcdir)/COPYING $(srcdir)/README $(srcdir)/INSTALL $(srcdir)/NEWS \
-	$(srcdir)/popclient.lsm $(srcdir)/RFC/*.txt \
-	$(srcdir)/*.man	$(srcdir)/sample.poprc
+	$(srcdir)/fetchmail.lsm $(srcdir)/RFC/*.txt \
+	$(srcdir)/*.man	$(srcdir)/sample.fetchrc
 config = $(srcdir)/Makefile.in $(srcdir)/configure.in $(srcdir)/configure \
 	$(srcdir)/config.guess $(srcdir)/config.h.in $(srcdir)/config.sub
 scripts = $(srcdir)/install.sh $(srcdir)/mkinstalldirs
 all = $(docs) $(config) $(srcs) $(parser) $(headers) $(extra) $(scripts) MANIFEST
 
 manifest: $(all)
-	@echo $(all) | tr "[ \t]" '\n' | sort | sed "s/\\./popclient-$(VERS)/"
+	@echo $(all) | tr "[ \t]" '\n' | sort | sed "s/\\./fetchmail-$(VERS)/"
 
-popclient-$(VERS).tar: $(all)
-	(cd ..; tar -cf popclient-$(VERS).tar `cat popclient-$(VERS)/MANIFEST`)
-	mv ../popclient-$(VERS).tar popclient-$(VERS).tar
-popclient-$(VERS).tar.gz: popclient-$(VERS).tar
-	gzip -f popclient-$(VERS).tar
+fetchmail-$(VERS).tar: $(all)
+	(cd ..; tar -cf fetchmail-$(VERS).tar `cat fetchmail-$(VERS)/MANIFEST`)
+	mv ../fetchmail-$(VERS).tar fetchmail-$(VERS).tar
+fetchmail-$(VERS).tar.gz: fetchmail-$(VERS).tar
+	gzip -f fetchmail-$(VERS).tar
 
 # The automatically generated dependencies below may omit config.h
 # because it is included with ``#include <config.h>'' rather than
diff --git a/NEWS b/NEWS
index 7151d9fc..8ed9085a 100644
--- a/NEWS
+++ b/NEWS
@@ -49,7 +49,11 @@ Recode POP2 to use the same driver/method strategy as POP3/IMAP, so
 all three protocols will be able to forward messages through the generic
 driver to SMTP.  (This requires that we find a POP2 server to test with.)
 
-3.2 (Mon Sep 23 13:29:46 EDT 1996):
+fetchmail-1.0 (Mon Sep 23 19:54:01 EDT 1996):
+
+* Name change (it ain't just for POP3 any more).
+
+popclient-3.2 (Mon Sep 23 13:29:46 EDT 1996):
 
 * RPOP support (coded at a user's request but untested).
 
@@ -66,7 +70,7 @@ driver to SMTP.  (This requires that we find a POP2 server to test with.)
 * Try USER and HOME to set defaults before going to the password file.
   This should work better in Sun NIS environments.
 
-3.1:
+popclient-3.1:
 
 * MDA arguments are now dumped when using the -V option.
 
@@ -85,20 +89,20 @@ driver to SMTP.  (This requires that we find a POP2 server to test with.)
 
 * It is now possible to specify the host TCP/IP port number to connect to.
 
-3.05:
+popclient-3.05:
 
 * Experimental support for RFC1725-compliant POP servers with the UIDL
   command and without LAST.
 
-3.04:
+popclient-3.04:
 
 * Logfile option works.
 
-3.03:
+popclient-3.03:
 
 * Minor bug fixes for password querying and redirection to stdout.
 
-3.02:
+popclient-3.02:
 
 * Correct buggy processing of nokeep/noflush/fetchall.
 
@@ -108,7 +112,7 @@ driver to SMTP.  (This requires that we find a POP2 server to test with.)
 
 * Delivery via sendmail now works in non-daemon mode.
 
-3.01:
+popclient-3.01:
 
 * Fixed a lexical analyzer bug in quoted-string processing.
 
@@ -117,7 +121,7 @@ driver to SMTP.  (This requires that we find a POP2 server to test with.)
 * The lock assertion code was in the wrong place relative to the daemonize()
   call.  
 
-3.0:
+popclient-3.0:
 
 Eric S. Raymond <esr@thyrsus.com> hacked extensively on 3.0b6 and took over
 the package with the consent of Carl Harris, the original implementor.
diff --git a/README b/README
index 0003b720..5867564b 100644
--- a/README
+++ b/README
@@ -1,35 +1,36 @@
-			README for popclient
+			README for fetchmail
 
-popclient is a full-featured, robust, well-documented POP2, POP3, APOP,
-and IMAP client originally developed by Carl Harris <ceharris@mal.com> and
-now maintained by Eric S. Raymond <esr@thyrsus.com>.
+fetchmail is a full-featured, robust, well-documented POP2, POP3, APOP,
+and IMAP client originally developed (under the name popclient) by Carl
+Harris <ceharris@mal.com> and now maintained by Eric S. Raymond
+<esr@thyrsus.com>.
 
-popclient was developed under Linux and should be readily portable to other
+fetchmail was developed under Linux and should be readily portable to other
 UNIX systems (it uses GNU autoconf).  It has also been ported to QNX; to build
-under QNX, see the header commets in the Makefile.
+under QNX, see the header comments in the Makefile.
 
-You can find the latest version of popclient from Eric's home page
+You can find the latest version of fetchmail from Eric's home page
 
 	http://www.ccil.org/~esr
 
-Features of popclient include:
+Features of fetchmail include:
 
 	* POP2, POP3, APOP, RPOP and IMAP support with auto-probing for a
 	  server on the host if no protocol is specified.
 
 	* Easy configuration via command line or free-format .poprc file.
 
-	* Daemon mode -- popmail can be run in background to poll
+	* Daemon mode -- fetchmail can be run in background to poll
 	  one or more hosts at a specified interval.
 
 	* Delivery via either file-append with mandatory locking or an
 	  MDA you specify, or via SMTP to the client machine's port 25.
 
 	* From:, To:, Cc:, and Reply-To: headers are rewritten so that 
-	  usernames relative to the popclient host become fully-qualified
+	  usernames relative to the fetchmail host become fully-qualified
 	  Internet addresses.  This enables replies to work correctly.
 
-There is a man page at popclient.man.  A sample rc file is at sample.poprc.
+There is a man page at fetchmail.man.  A sample rc file is at sample.fetchrc.
 For a release history, see the file NEWS.
 							-- esr
 
diff --git a/configure.in b/configure.in
index 68306f51..2c3552b2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,10 @@
-dnl Autoconfigure input file for popclient
+dnl Autoconfigure input file for fetchmail
 dnl Carl Harris, ceharris@mal.com
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_INIT(popclient.h)		dnl A distinctive file to look for in srcdir. 
+AC_INIT(fetchmail.h)		dnl A distinctive file to look for in srcdir. 
 AC_CONFIG_HEADER(config.h)
 
 # We want these before the checks, so the checks can modify their values.
@@ -67,7 +67,7 @@ case $host in
 		# Do *not* use the -t option!  We explicitly want only
 		# local delivery to the recipients named on the command line.
 		# Also don't use -fpopmail -- this looks tempting, but will
-		# cause lossage unless you always run popclient from the
+		# cause lossage unless you always run fetchmail from the
 		# account of a privileged user.
 		AC_DEFINE(DEF_MDA,"/usr/lib/sendmail -oem %s")
 		mdacmd="/usr/lib/sendmail -fpopmail \$u"
@@ -195,7 +195,7 @@ AC_TRY_LINK([#include <signal.h>
   AC_MSG_RESULT(no))
 
 # The presence of the following is not meant to imply
-# that popclient necessarily works on those systems.
+# that fetchmail necessarily works on those systems.
 dnl AC_DYNIX_SEQ
 dnl AC_XENIX_DIR
 dnl AC_IRIX_SUN
diff --git a/daemon.c b/daemon.c
index b08f31e9..7acbb874 100644
--- a/daemon.c
+++ b/daemon.c
@@ -6,7 +6,7 @@
 
 /***********************************************************************
   module:       daemon
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
   description:  This module contains all of the code needed to 
 	 	turn a process into a daemon for POSIX, SysV, and
@@ -40,7 +40,7 @@
 #define SIGCLD	SIGCHLD
 #endif
 
-#include "popclient.h"
+#include "fetchmail.h"
 
 /******************************************************************
   function:	sigchld_handler
diff --git a/driver.c b/driver.c
index 24fcae9c..6ab0dd0f 100644
--- a/driver.c
+++ b/driver.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       driver.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Eric S. Raymond
   description:  Generic driver for mail fetch method protocols
 
@@ -28,7 +28,7 @@
 #include  <malloc.h>
 
 #include  "socket.h"
-#include  "popclient.h"
+#include  "fetchmail.h"
 #include  "smtp.h"
 
 static struct method *protocol;
@@ -55,7 +55,7 @@ static int gen_readmsg (int socket, int mboxfd, long len, int delimited,
     proto        protocol method pointer
 
   return value:  exit code from the set of PS_.* constants defined in 
-                 popclient.h
+                 fetchmail.h
   calls:
   globals:       reads outlevel.
  *********************************************************************/
@@ -660,7 +660,7 @@ int rewrite;
 		    return(PS_SMTP);
 #ifdef SMTP_RESEND
 		/*
-		 * This is what we'd do if popclient were a real MDA
+		 * This is what we'd do if fetchmail were a real MDA
 		 * a la sendmail -- crack all the destination headers
 		 * and send to every address we can reach via SMTP.
 		 */
diff --git a/fetchmail.c b/fetchmail.c
index f25ca98c..d677be9f 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -4,11 +4,11 @@
  */
 
 /***********************************************************************
-  module:       popclient.c
-  project:      popclient
+  module:       fetchmail.c
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
 		Extensively hacked and improved by esr.
-  description:	main driver module for popclient
+  description:	main driver module for fetchmail
 
  ***********************************************************************/
 
@@ -36,7 +36,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "popclient.h"
+#include "fetchmail.h"
 
 /* release info */
 #define         RELEASE_TAG	"3.1"
@@ -60,7 +60,7 @@ char *logfile;		/* log file for daemon mode */
 int quitmode;		/* if --quit was set */
 
 /* miscellaneous global controls */
-char *poprcfile;	/* path name of rc file */
+char *rcfile;		/* path name of rc file */
 char *idfile;		/* path name of id file */
 int linelimit;		/* limit # lines retrieved per site */
 int versioninfo;	/* emit only version info */
@@ -111,7 +111,7 @@ char **argv;
     if (versioninfo)
 	showversioninfo();
 
-    if (prc_parse_file(poprcfile) != 0)
+    if (prc_parse_file(rcfile) != 0)
 	exit(PS_SYNTAX);
 
     if (optind >= argc)
@@ -138,7 +138,7 @@ char **argv;
     if ((tmpdir = getenv("TMPDIR")) == (char *)NULL)
 	tmpdir = "/tmp";
     strcpy(tmpbuf, tmpdir);
-    strcat(tmpbuf, "/poplock-");
+    strcat(tmpbuf, "/fetchmail-");
     gethostname(tmpbuf + strlen(tmpbuf), HOSTLEN+1);
     if ((user = getenv("USER")) != (char *)NULL)
     {
@@ -148,7 +148,7 @@ char **argv;
 
     /* perhaps we just want to check options? */
     if (versioninfo) {
-	printf("Taking options from command line and %s\n", poprcfile);
+	printf("Taking options from command line and %s\n", rcfile);
 	for (hostp = hostlist; hostp; hostp = hostp->next) {
 	    printf("Options for host %s:\n", hostp->servername);
 	    dump_params(hostp);
@@ -158,17 +158,17 @@ char **argv;
 	if (hostlist == NULL)
 	    (void) fprintf(stderr,
 		"No mailservers set up -- perhaps %s is missing?\n",
-			  poprcfile);
+			  rcfile);
 	exit(0);
     }
     else if (hostlist == NULL) {
-	(void) fputs("popclient: no mailservers have been specified.\n", stderr);
+	(void) fputs("fetchmail: no mailservers have been specified.\n", stderr);
 	exit(PS_SYNTAX);
     }
 
     if ((lockfile = (char *) malloc(strlen(tmpbuf) + 1)) == NULL)
     {
-	fprintf(stderr,"popclient: cannot allocate memory for lock name.\n");
+	fprintf(stderr,"fetchmail: cannot allocate memory for lock name.\n");
 	exit(PS_EXCLUDE);
     }
     else
@@ -180,16 +180,16 @@ char **argv;
 	FILE* fp;
 
 	if ( (fp = fopen(lockfile, "r")) == NULL ) {
-	    fprintf(stderr,"popclient: no other popclient is running\n");
+	    fprintf(stderr,"fetchmail: no other fetchmail is running\n");
 	    return(PS_EXCLUDE);
 	}
   
 	fscanf(fp,"%d",&pid);
-	fprintf(stderr,"popclient: killing popclient at PID %d\n",pid);
+	fprintf(stderr,"fetchmail: killing fetchmail at PID %d\n",pid);
 	if ( kill(pid,SIGTERM) < 0 )
-	    fprintf(stderr,"popclient: error killing the process %d.\n",pid);
+	    fprintf(stderr,"fetchmail: error killing the process %d.\n",pid);
 	else
-	    fprintf(stderr,"popclient: popclient at %d is dead.\n", pid);
+	    fprintf(stderr,"fetchmail: fetchmail at %d is dead.\n", pid);
   
 	fclose(fp);
 	remove(lockfile);
@@ -197,7 +197,7 @@ char **argv;
     }
 
 
-    /* beyond here we don't want more than one popclient running per user */
+    /* beyond here we don't want more than one fetchmail running per user */
     umask(0077);
     if ( (tmpfp = fopen(lockfile, "r")) != NULL ) {
 	fscanf(tmpfp,"%d",&pid);
@@ -331,7 +331,7 @@ struct hostrec *queryctl;
 	time_t now;
 
 	time(&now);
-	fprintf(stderr, "popclient: querying %s (protocol %s) at %s",
+	fprintf(stderr, "fetchmail: querying %s (protocol %s) at %s",
 	    queryctl->servername, showproto(queryctl->protocol), ctime(&now));
     }
     switch (queryctl->protocol) {
@@ -356,7 +356,7 @@ struct hostrec *queryctl;
 	return(doIMAP(queryctl));
 	break;
     default:
-	fprintf(stderr,"popclient: unsupported protocol selected.\n");
+	fprintf(stderr,"fetchmail: unsupported protocol selected.\n");
 	return(PS_PROTOCOL);
     }
 }
@@ -372,7 +372,7 @@ struct hostrec *queryctl;
 
 int showversioninfo()
 {
-    printf("This is popclient release %s\n",RELEASE_TAG);
+    printf("This is fetchmail release %s\n",RELEASE_TAG);
 }
 
 /*********************************************************************
@@ -495,7 +495,7 @@ struct hostrec *queryctl;
 	    return(fd);
 	}
 	else {
-	    perror("popclient: openuserfolder: open()");
+	    perror("fetchmail: openuserfolder: open()");
 	    return(-1);
 	}
   
@@ -523,11 +523,11 @@ struct hostrec *queryctl;
     char binmailargs [80];
 
     if (pipe(pipefd) < 0) {
-	perror("popclient: openmailpipe: pipe");
+	perror("fetchmail: openmailpipe: pipe");
 	return(-1);
     }
     if ((childpid = fork()) < 0) {
-	perror("popclient: openmailpipe: fork");
+	perror("fetchmail: openmailpipe: fork");
 	return(-1);
     }
     else if (childpid == 0) {
@@ -536,14 +536,14 @@ struct hostrec *queryctl;
 	close(pipefd[1]);  /* close the 'write' end of the pipe */
 	close(0);          /* get rid of inherited stdin */
 	if (dup(pipefd[0]) != 0) {
-	    fputs("popclient: openmailpipe: dup() failed\n",stderr);
+	    fputs("fetchmail: openmailpipe: dup() failed\n",stderr);
 	    exit(1);
 	}
 
 	execv(queryctl->mda, mda_argv+1);
 
 	/* if we got here, an error occurred */
-	perror("popclient: openmailpipe: exec");
+	perror("fetchmail: openmailpipe: exec");
 	return(-1);
 
     }
@@ -578,7 +578,7 @@ int fd;
 	err = 0;
   
     if (err)
-	perror("popclient: closeuserfolder: close");
+	perror("fetchmail: closeuserfolder: close");
 
     return(err);
 }
@@ -613,7 +613,7 @@ int fd;
     childpid = wait((int *) 0);
 #endif
     if (err)
-	perror("popclient: closemailpipe: close");
+	perror("fetchmail: closemailpipe: close");
 
     if (outlevel == O_VERBOSE)
 	fprintf(stderr, "closed pipe %d\n", fd);
diff --git a/fetchmail.h b/fetchmail.h
index 17af19c5..b4391226 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -4,8 +4,8 @@
  */
 
 /***********************************************************************
-  module:       popclient.h
-  project:      popclient
+  module:       fetchmail.h
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
   description:  global constant, type, and variable definitions.
 
@@ -108,7 +108,7 @@ extern char *logfile;		/* log file for daemon mode */
 extern int quitmode;		/* if --quit was set */
 
 /* miscellaneous global controls */
-extern char *poprcfile;		/* path name of rc file */
+extern char *rcfile;		/* path name of rc file */
 extern char *idfile;		/* path name of id file */
 extern int linelimit;		/* limit # lines retrieved per site */
 extern int versioninfo;		/* emit only version info */
diff --git a/fetchmail.man b/fetchmail.man
index 60a0604f..c90600f3 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -1,14 +1,14 @@
 .\" Copyright 1993-95 by Carl Harris, Jr. Copyright 1996 by Eric S. Raymond
 .\" All rights reserved.
 .\" For license terms, see the file COPYING in this directory.
-.TH popclient LOCAL
+.TH fetchmail LOCAL
 .SH NAME
-popclient \- retrieve mail from a mailserver using POP or IMAP
+fetchmail \- retrieve mail from a mailserver using POP or IMAP
 .SH SYNOPSIS
-.B popclient
+.B fetchmail
 [\fI options \fR] \fI [server-host...]\fR
 .SH DESCRIPTION
-.I popclient
+.I fetchmail
 is a mail retrieval client which supports 
 POP2 (as specified in RFC 937), POP3 (RFC 1725), IMAP2bis (as
 implemented by the 4.4BSD imapd program), and IMAP4 (RFC1730).
@@ -16,7 +16,7 @@ It can use (but does not require) the RPOP and LAST facilities
 removed from later POP3 versions.
 .PP
 The,
-.I popclient
+.I fetchmail
 program may be used to download mail in batch from the remote
 mailserver specified by
 .I host
@@ -27,22 +27,22 @@ or
 .I elm.
 .PP
 To facilitate the use of
-.I popclient
+.I fetchmail
 in scripts, pipelines, etc, it returns an appropriate exit code upon 
 termination -- see EXIT CODES below.
 .PP
 The behavior of
-.I popclient
+.I fetchmail
 is controlled by comand-line options and a control file,
-.I ~/.poprc
+.I ~/.fetchrc
 the syntax of which we describe below.  Command-line options override
-.I ~/.poprc
+.I ~/.fetchrc
 declarations.
 .SH OPTIONS
 Each server name that you specify (following the options on the
 command line) will be queried.  If you don't specify any servers
 on the command line, each server in your 
-.I ~/.poprc
+.I ~/.fetchrc
 file will be queried.
 .TP
 .B \-2
@@ -62,7 +62,7 @@ the mailserver.
 .B \-S host, --smtphost host
 Specify an SMTP forwarding host (other than localhost).  Normally
 fetched mail is delivered by SMTP over a socket to the client machine
-.I popclient
+.I fetchmail
 is running on (this simulates the way mail would
 be delivered to the client by a normal Internet TCP/IP connection).
 With this option you can specify another host to deliver to.
@@ -90,8 +90,8 @@ options on the same command line.
 POP3 only.  Delete old (previously retrieved) messages from the mailserver
 before retrieving new messages.
 .TP
-.B \-f pathname, --poprc pathname
-Specify an alternate name for the .poprc file.
+.B \-f pathname, --fetchrc pathname
+Specify an alternate name for the .fetchrc file.
 .TP
 .B \-i pathname, --idfile pathname
 Specify an alternate name for the .popids file.
@@ -100,14 +100,14 @@ Specify an alternate name for the .popids file.
 Keep retrieved messages in folder on remote mailserver.  Normally, messages 
 are deleted from the folder on the mailserver after they have been retrieved
 (unless 
-.I popclient
+.I fetchmail
 was compiled with the KEEP_IS_DEFAULT option).  Specifying the 
 .B keep 
 option causes retrieved messages to remain in your folder on the mailserver.
 .TP
 .B \-K, --kill
 Delete retrieved messages from the remote mailserver.  If 
-.I popclient
+.I fetchmail
 is compiled with the KEEP_IS_DEFAULT option, the
 .B kill
 option forces retrieved mail to be deleted.
@@ -126,7 +126,7 @@ option remain on the remote mailserver.
 .B \-p, \--protocol proto
 Specify the protocol to used when communicating with the remote 
 mailserver.  If no protocol is specified,
-.I popclient
+.I fetchmail
 will try each of the supported protocols in turn, terminating after
 any successful attempt.
 .I proto 
@@ -174,12 +174,12 @@ option takes precedence.
 Specifies the user idenfication to be used when logging-in to the mailserver.
 The appropriate user identification is both server and user-dependent.  
 The default is your login name on the machine that is running 
-.I popclient.
+.I fetchmail.
 See USER AUTHENTICATION below for a complete description.
 .TP
 .B \-v, --verbose
 Verbose mode.  All control messages passed between 
-.I popclient
+.I fetchmail
 and the mailserver are echoed to stderr.  Specifying
 .B verbose
 causes normal progress/status messages which would be redundant or meaningless
@@ -187,7 +187,7 @@ to be modified or omitted.
 .TP
 .B \-N, --norewrite
 Normally,
-.I popclient
+.I fetchmail
 edits RFC-822 address headers (To, From, Cc, Bcc, and Reply-To) in
 fetched mail so that any mail IDs local to the server are expanded to
 full addresses (@ and the POP host name are appended).  This enables 
@@ -197,16 +197,16 @@ client machine).  This option disables the rewrite.
 .TP
 .B \-V, --version
 Displays the version information for your copy of 
-.I popclient.
+.I fetchmail.
 No POP connection is made.
 Instead, for each server specified, all option information
 that would be computed if
-.I popclient.
+.I fetchmail.
 were connecting to that server is displayed.
 .TP
 .SH USER AUTHENTICATION
 User authentication in 
-.I popclient
+.I fetchmail
 is very much like the authentication mechanism of 
 .I ftp(1).
 The correct user-id and password depend upon the underlying security
@@ -214,7 +214,7 @@ system at the mailserver.
 .PP
 If the mailserver is a Unix machine on which you have an ordinary user 
 account, your regular login name and password are used with 
-.I popclient.
+.I fetchmail.
 If you use the same login name on both the server and the client machines,
 you needn't worry about specifying a user-id with the 
 .B \-u
@@ -225,21 +225,21 @@ on the server machine, specify that login name with the
 .B \-u
 option.  e.g. if your login name is 'jsmith' on a machine named 'mailgrunt',
 you would start 
-.I popclient 
+.I fetchmail 
 as follows:
 .IP
-popclient -u jsmith mailgrunt
+fetchmail -u jsmith mailgrunt
 .PP
 The default behavior of 
-.I popclient
+.I fetchmail
 is to prompt you for your mailserver password before the POP connection is
 established.  This is the safest way to use 
-.I popclient
+.I fetchmail
 and ensures that your password will not be compromised.  You may also specify
 your password in your
-.I ~/.poprc
+.I ~/.fetchrc
 file.  This is convenient when using 
-.I popclient
+.I fetchmail
 with automated scripts.
 .PP
 On mailservers that do not provide ordinary user accounts, your user-id and 
@@ -250,20 +250,20 @@ the correct user-id and password for your mailbox account.
 POP3 versions up to the RFC1225 version supported an alternate
 authentication mechanism called RPOP intended to remove the security
 risk inherent in sending unencrypted account passwords across the net
-(in RFC1460 this facility was replaced with APOP).  If your .poprc
+(in RFC1460 this facility was replaced with APOP).  If your .fetchrc
 file specifies an RPOP id and a connection port in the privileged
 range (1..1024),
-.I popclient will
+.I fetchmail will
 ship the id with an RPOP command rather than sending a password.
-(Note: you'll need to be running popclient setuid root for RPOP to
+(Note: you'll need to be running fetchmail setuid root for RPOP to
 work --
-.I popclient
+.I fetchmail
 has to bind to a privileged port locally in order for the mail 
 server to believe it's allowed to bind to a privileged remote port.)
 .PP
 .SH OUTPUT OPTIONS
 The default behavior of 
-.I popclient
+.I fetchmail
 is to ship mail to the the SMTP port on the machine it is running on
 (localhost), as though it were being passed over a normal TCP/IP link.
 This normally results in the mail being delivered locally via your
@@ -280,7 +280,7 @@ Using the
 .B \-o
 option, you can specify a mail folder to which retrieved
 messages will be appended;
-.I popclient
+.I fetchmail
 always writes the retrieved messages using Unix mail folder format so
 the folder will be parsed correctly by Unix mail programs such as
 .I elm
@@ -291,20 +291,20 @@ If you prefer, for example, to have your POP
 mail from a machine called 'mailgrunt' stored in the 
 .I mbox
 file in your home directory, you would start 
-.I popclient
+.I fetchmail
 as follows:
 .IP 
-popclient \-o $HOME/mbox mailgrunt
+fetchmail \-o $HOME/mbox mailgrunt
 .PP
 Note that the folder specified with
 .B \-o
-is write-locked while popclient is writing to it,   
+is write-locked while fetchmail is writing to it,   
 .PP
-.I popclient
+.I fetchmail
 can be used in a shell pipeline by using the 
 .B \-c
 option.  In this mode, 
-.I popclient
+.I fetchmail
 writes the retrieved messages to stdout, instead of a mail folder.  This would
 allow you, for instance, to pass the incoming mail through a filter that
 discards mail marked as 'Precedence: junk'.  Suppose you've written an AWK
@@ -313,7 +313,7 @@ syntax to retrieve your mail from 'mailgrunt', pass it through the filter,
 and write it to a folder called 'realmail' in your home directory would be:
 
 .nf
-  popclient -c mailgrunt | awk -f dumpjunk.awk >$HOME/realmail
+  fetchmail -c mailgrunt | awk -f dumpjunk.awk >$HOME/realmail
 .fi
 .PP
 The progress/status messages written to stderr when the 
@@ -331,13 +331,13 @@ to insure that your messages will not be lost if part of the shell pipeline
 does not function incorrectly.  The safest bet would be something like:
 
 .nf
-  popclient -k -c mailgrunt | myfilter >$HOME/filtered.mail
+  fetchmail -k -c mailgrunt | myfilter >$HOME/filtered.mail
 .fi
 .PP
 followed by
 
 .nf
-  popclient -c mailgrunt > /dev/null
+  fetchmail -c mailgrunt > /dev/null
 .fi
 .PP
 when you're sure the messages were correctly processed by 'myfilter'.
@@ -348,25 +348,25 @@ The
 or
 .B -d 
 option runs 
-.I popclient
+.I fetchmail
 in daemon mode.  You must specify a numeric argument which is a
 polling interval in seconds.
 .PP
 In daemon mode, 
-.I popclient
+.I fetchmail
 puts itself in background and runs forever, querying each specified
 host and then sleeping for the given polling interval.
 .PP
 Simply invoking
 .IP
-popclient -d 900
+fetchmail -d 900
 .PP
 will, therefore, poll the hosts described in your 
-.I ~/.poprc
+.I ~/.fetchrc
 file once every fifteen minutes.
 .PP
 Only one daemon process is permitted per user; in daemon mode,
-.I popclient
+.I fetchmail
 makes a per-user lockfile to guarantee this.  The option
 .B --quit
 will kill a running daemon process.
@@ -378,12 +378,12 @@ or
 option allows you to redirect status messages emitted while in daemon
 mode into a specified logfile (follow the option with the logfile name).
 This is primarily useful for debugging configurations.
-.SH THE POPRC FILE
-The preferred way to set up popclient (and the only way if you want to
-specify a password) is to write a .poprc file in your home directory.
-To protect the security of your passwords, your ~/.poprc may not have
+.SH THE FETCHRC FILE
+The preferred way to set up fetchmail (and the only way if you want to
+specify a password) is to write a .fetchrc file in your home directory.
+To protect the security of your passwords, your ~/.fetchrc may not have
 more than u+r,u+w permissions; 
-.I popclient
+.I fetchmail
 will complain and exit otherwise.
 .PP
 Comments begin with a '#' and extend through the end of the line.
@@ -486,13 +486,13 @@ by individual server descriptions.  So, you could write:
 .fi
 .SH EXIT CODES
 To facilitate the use of 
-.I popclient
+.I fetchmail
 in shell scripts and the like, an exit code is returned to give an indication
 of what occured during a given POP connection.  The exit code can be tested
 by the script and appropriate action taken.
 .PP
 A simple example follows.  This Bourne shell script executes 
-.I popclient
+.I fetchmail
 and, if some messages were successfully retrieved from a mailserver retrieved
 from the command line, it starts the 
 .I mail
@@ -501,7 +501,7 @@ exits.
 .EX 0
 #!/bin/sh
 
-if popclient $1
+if fetchmail $1
 then
   mail
 else
@@ -510,7 +510,7 @@ fi
 .EE
 .PP
 The exit codes returned by 
-.I popclient
+.I fetchmail
 are as follows:
 .IP 0
 One or more messages were successfully retrieved.
@@ -527,55 +527,55 @@ user-id, password, or RPOP id was specified.
 Some sort of fatal protocol error was detected.
 .IP 5
 There was a syntax error in the arguments to 
-.I popclient.
+.I fetchmail.
 .IP 6
 Some kind of I/O woes occurred when writing to the local folder.
 .IP 7
 There was an error condition reported by the server (POP3 only).
 .IP 8
 Exclusion error.  This means 
-.I popclient
+.I fetchmail
 either found another copy of itself already running, or failed in such
 a way that it isn't sure whether another copy is running.
 .IP 9
 The 
-.I popclient.
+.I fetchmail.
 run failed while trying to do an SMTP port open or transaction.
 .IP 10
 Something totally undefined occured.  This is usually caused by a bug within
-.I popclient.
+.I fetchmail.
 Do let me know if this happens.
 .PP
 When
-.I popclient
+.I fetchmail
 queries more than one host, the returned status is that of the last
 host queried.
 .SH AUTHOR
-.I popclient
+.I fetchmail
 was originated by Carl Harris at Virginia Polytechnic Institute and State   
 University (a.k.a. Virginia Tech).  Version 3.0 was extensively improved
 by Eric S. Raymond <esr@snark.thyrsus.com> and is now maintained by esr.
 .PP
 .SH FILES
 .TP 5
-~/.poprc
+~/.fetchrc
 default configuration file
 .TP 5
 ~/.popids
 default location of file associating hosts with last message IDs seen
 (used only with newer RFC1725-compliant servers supporting the UIDL command).
 .TP 5
-${TMPDIR}/poplock-${HOST}-${USER}
+${TMPDIR}/fetchmail-${HOST}-${USER}
 lock file to help prevent concurrent runs.
 .SH ENVIRONMENT
 For correct initialization, 
-.I popclient
+.I fetchmail
 requires either that both the USER and HOME environment variables are
 correctly set, or that \fBgetpwuid\fR(3) be able to retrieve a password
 entry from your user ID.
 .SH BUGS
 Running more than one concurrent instance of
-.I popclient
+.I fetchmail
 on the same mailbox may cause messages to be lost or remain unfetched.
 .PP
 When using POP2, the --smtphost option doesn't work, and mail headers
@@ -592,19 +592,25 @@ without LAST, are not yet well tested.
 Send comments, bug reports, gripes, and the like to Eric S. Raymond
 <esr@thyrsus.com>.
 .SH NOTE
-The --password option of previous versions has been removed -- it
+This program used to be called `popclient' (the name was changed
+because it supports IMAP now and may well support more remote-fetch
+protocols such as DMSP in the future).
+.PP
+The --password option of previous (popclient) versions has been removed -- it
 encouraged people to expose passwords in scripts.  Passwords
 must now be specified either interactively or in your
-.I ~/.poprc
+.I ~/.fetchrc
 file.  The short-form -p option now specifies the protocol to use.
 .PP
 The reason the password isn't stored encrypted is because this doesn't
 actually add protection.  Anyone who's acquired permissions to read your
-poprc file will be able to run popclient as you anyway -- and if it's
+fetchrc file will be able to run 
+.I fetchmail
+as you anyway -- and if it's
 your password they're after, they'd be able to use the necessary decoder from
-.I popclient
+.I fetchmail
 itself to get it.  All encryption would do in this context is give a
 false sense of security to people who don't think very hard.
 .SH SEE ALSO
-mail(1), binmail(1), sendmail(8), popd(8),
+mail(1), binmail(1), sendmail(8), popd(8), imapd(8)
 RFC 937, RFC 1081, RFC 1082, RFC 1225, RFC 1460, RFC 1725.
diff --git a/getpass.c b/getpass.c
index e2854b7a..84079baf 100644
--- a/getpass.c
+++ b/getpass.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       getpass.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
   description: 	getpass() replacement which allows for long passwords.
 
diff --git a/imap.c b/imap.c
index 06312d02..87dfe199 100644
--- a/imap.c
+++ b/imap.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       imap.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Eric S. Raymond
   description:  IMAP client code
 
@@ -24,7 +24,7 @@
 #include  <errno.h>
 
 #include  "socket.h"
-#include  "popclient.h"
+#include  "fetchmail.h"
 
 static int count, first;
 
diff --git a/md5global.h b/md5global.h
index 99eb0a01..fb98e5b8 100644
--- a/md5global.h
+++ b/md5global.h
@@ -2,7 +2,7 @@
  * All rights reserved.
  * For license terms, see the file COPYING in this directory.
  *
- * md5global.h    Global declarations for MD5 module used by popclient
+ * md5global.h    Global declarations for MD5 module used by fetchmail
  *
  */
 
diff --git a/md5ify.c b/md5ify.c
index da4337be..8999c6d6 100644
--- a/md5ify.c
+++ b/md5ify.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       md5ify.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
   description:  Simple interface to MD5 module.
 
diff --git a/options.c b/options.c
index 8329b883..305444f4 100644
--- a/options.c
+++ b/options.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       options.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
   description:	command-line option processing
 
@@ -16,7 +16,7 @@
 
 #include <pwd.h>
 #include "getopt.h"
-#include "popclient.h"
+#include "fetchmail.h"
 #include "bzero.h"
 
 #define LA_VERSION	1 
@@ -30,7 +30,7 @@
 #define LA_FLUSH        9
 #define LA_PROTOCOL	10
 #define LA_DAEMON	11
-#define LA_POPRC	12
+#define LA_FETCHRC	12
 #define	LA_IDFILE	13
 #define LA_USERNAME	14
 #define LA_REMOTEFILE	15
@@ -57,7 +57,7 @@ static struct option longoptions[] = {
   {"protocol",	required_argument, (int *) 0, LA_PROTOCOL   },
   {"proto",	required_argument, (int *) 0, LA_PROTOCOL   },
   {"daemon",	required_argument, (int *) 0, LA_DAEMON     },
-  {"poprc",	required_argument, (int *) 0, LA_POPRC      },
+  {"fetchrc",	required_argument, (int *) 0, LA_FETCHRC      },
   {"user",	required_argument, (int *) 0, LA_USERNAME   },
   {"username",  required_argument, (int *) 0, LA_USERNAME   },
   {"remote",    required_argument, (int *) 0, LA_REMOTEFILE },
@@ -91,7 +91,7 @@ static struct option longoptions[] = {
 	   	 syntax errors.
   calls:         none.  
   globals:       writes outlevel, versioninfo, yydebug, logfile, 
-		 poll_interval, quitmode, poprcfile, idfile, linelimit.  
+		 poll_interval, quitmode, rcfile, idfile, linelimit.  
  *********************************************************************/
 
 int parsecmdline (argc,argv,queryctl)
@@ -191,9 +191,9 @@ struct hostrec *queryctl;
 	poll_interval = atoi(optarg);
         break;
       case 'f':
-      case LA_POPRC:
-        poprcfile = (char *) xmalloc(strlen(optarg)+1);
-        strcpy(poprcfile,optarg);
+      case LA_FETCHRC:
+        rcfile = (char *) xmalloc(strlen(optarg)+1);
+        strcpy(rcfile,optarg);
         break;
       case 'i':
       case LA_IDFILE:
@@ -259,7 +259,7 @@ struct hostrec *queryctl;
 
   if (errflag) {
     /* squawk if syntax errors were detected */
-    fputs("usage:  popclient [options] [server ...]\n", stderr);
+    fputs("usage:  fetchmail [options] [server ...]\n", stderr);
     fputs("  options\n",stderr);
     fputs("  -2               use POP2 protocol\n", stderr);
     fputs("  -3               use POP3 protocol\n", stderr);
@@ -277,7 +277,7 @@ struct hostrec *queryctl;
     fputs("  -s, --silent     work silently\n", stderr);
     fputs("  -v, --verbose    work noisily (diagnostic output)\n", stderr);
     fputs("  -d, --daemon     run as a daemon once per n seconds\n", stderr);
-    fputs("  -f, --poprc      specify alternate config file\n", stderr);
+    fputs("  -f, --fetchrc      specify alternate config file\n", stderr);
     fputs("  -i, --idfile     specify alternate ID database\n", stderr);
     fputs("  -u, --username   specify server user ID\n", stderr);
     fputs("  -c, --stdout     write received mail to stdout\n", stderr);
@@ -306,7 +306,7 @@ struct hostrec *queryctl;
   return value:  zero if defaults were successfully set, else non-zero
                  (indicates a problem reading /etc/passwd).
   calls:         none.
-  globals:       writes outlevel, poprcfile, idfile.
+  globals:       writes outlevel, rcfile, idfile.
  *********************************************************************/
 #include <stdlib.h>
 
@@ -350,12 +350,12 @@ struct hostrec *queryctl;
     queryctl->output = TO_SMTP;
     (void) sprintf(queryctl->mda, DEF_MDA, queryctl->localname);
 
-    poprcfile = 
-	(char *) xmalloc(strlen(home)+strlen(POPRC_NAME)+2);
+    rcfile = 
+	(char *) xmalloc(strlen(home)+strlen(FETCHRC_NAME)+2);
 
-    strcpy(poprcfile, home);
-    strcat(poprcfile, "/");
-    strcat(poprcfile, POPRC_NAME);
+    strcpy(rcfile, home);
+    strcat(rcfile, "/");
+    strcat(rcfile, FETCHRC_NAME);
 
     idfile = 
 	(char *) xmalloc(strlen(home)+strlen(IDFILE_NAME)+2);
diff --git a/pop2.c b/pop2.c
index 5b27e918..4d67b518 100644
--- a/pop2.c
+++ b/pop2.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       pop2.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
 		Hacks and bug fixes by esr.
   description:  POP2 client code.
@@ -26,7 +26,7 @@
 #include  <errno.h>
 
 #include  "socket.h"
-#include  "popclient.h"
+#include  "fetchmail.h"
 
 
 /* TCP port number for POP2 as defined by RFC 937 */
@@ -55,7 +55,7 @@ int POP2_stateXFER (int msgsize, int socket, int mboxfd, int topipe);
                  etc).
 
   return value:  exit code from the set of PS_.* constants defined in 
-                 popclient.h
+                 fetchmail.h
   calls:         POP2_stateGREET, POP2_stateNMBR, POP2_stateSIZE,
                  POP2_stateXFER, POP2_sendcmd, POP2_sendHELO,
                  POP2_sendFOLD, POP2_quit, Socket, openuserfolder,
diff --git a/pop3.c b/pop3.c
index 4ea41660..af62b958 100644
--- a/pop3.c
+++ b/pop3.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       pop3.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
 		Hacks and bug fixes by esr.
   description:  POP3 client code.
@@ -24,7 +24,7 @@
 #include  <errno.h>
 
 #include  "socket.h"
-#include  "popclient.h"
+#include  "fetchmail.h"
 
 #ifdef HAVE_PROTOTYPES
 /* prototypes for internal functions */
diff --git a/rcfile_l.l b/rcfile_l.l
index 508c1d51..a6f0f2e3 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -7,7 +7,7 @@
 
 /***********************************************************************
   module:       poprc_l.l
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
 		Extensively hacked by esr.
   description:  .poprc lexer
@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include "poproto.h"
-#include "poprc_y.h"
+#include "fetchrc_y.h"
 
 int prc_lineno = 1;
 %}
diff --git a/rcfile_y.y b/rcfile_y.y
index 284d7352..979856d5 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -6,7 +6,7 @@
 
 /***********************************************************************
   module:       poprc_y.y
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
 		Extensively hacked and fixed by esr.
   description:  .poprc parser
@@ -15,7 +15,7 @@
 
 #include <config.h>
 #include <stdio.h>
-extern char *poprcfile;
+extern char *rcfile;
 extern int prc_lineno;
 extern int prc_errflag;
 extern char *yytext;
@@ -91,6 +91,6 @@ proto:		PROTO_POP2
 yyerror (s)
 char *s;
 {
-  fprintf(stderr,"%s line %d: %s at %s\n", poprcfile, prc_lineno, s, yytext);
+  fprintf(stderr,"%s line %d: %s at %s\n", rcfile, prc_lineno, s, yytext);
   prc_errflag++;
 }
diff --git a/sample.rcfile b/sample.rcfile
index 99c13172..36b50ce6 100644
--- a/sample.rcfile
+++ b/sample.rcfile
@@ -2,14 +2,14 @@
 #
 # This file (or one of your own creation, rather) should be located 
 # in your home directory with the name .poprc.  Permissions on this
-# file may be no greater than -rw-------, or popclient will refuse to
+# file may be no greater than -rw-------, or fetchmail will refuse to
 # use it.
 #
 # To see what effect your ~/.poprc file has, do 
 #
-#	popclient --version
+#	fetchmail --version
 #
-# This will display the popclient version number and an explanation
+# This will display the fetchmail version number and an explanation
 # in English of what the currently set options and defaults mean.
 #
 # Comments begin with a '#' and extend through the end of the line.
diff --git a/smtp.c b/smtp.c
index b152aa5e..d96e3248 100644
--- a/smtp.c
+++ b/smtp.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       smtp.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Harry Hochheiser
   description:  Handling of SMTP connections, and processing of mail 
                  to be forwarded via SMTP connections.
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <string.h>
 #include "socket.h"
-#include "popclient.h"
+#include "fetchmail.h"
 #include "smtp.h"
 
 /*********************************************************************
@@ -27,7 +27,7 @@
 
   arguments:     
     socket       TCP/IP socket for connection to SMTP
-  return value:  Result of SMTP_OK: based on codes in popclient.h.
+  return value:  Result of SMTP_OK: based on codes in fetchmail.h.
                  
  *********************************************************************/
 
@@ -56,7 +56,7 @@ int SMTP_helo(int socket,char *host)
     Note: these args are likely to change, as we get fancier about
     handling the names.
 
-  return value:  Result of SMTP_ok: based on codes in popclient.h.
+  return value:  Result of SMTP_ok: based on codes in fetchmail.h.
                  
  *********************************************************************/
 int SMTP_from(int socket, char *from)
@@ -81,7 +81,7 @@ int SMTP_from(int socket, char *from)
     touser:      user name of recipient
     tohost:      host name of recipient
 
-  return value:  Result of SMTP_OK: based on codes in popclient.h.
+  return value:  Result of SMTP_OK: based on codes in fetchmail.h.
                  
  *********************************************************************/
 int SMTP_rcpt(int socket,char *to)
@@ -124,7 +124,7 @@ int SMTP_data(int socket)
 
   arguments:     
     socket       TCP/IP socket for connection to SMTP
-  return value:  Result of SMTP_OK: based on codes in popclient.h.
+  return value:  Result of SMTP_OK: based on codes in fetchmail.h.
                  
  *********************************************************************/
 
@@ -159,7 +159,7 @@ void SMTP_rset(int socket)
   description:   Returns the status of the smtp connection
   arguments:     
     socket       TCP/IP socket for connection to SMTP
-  return value:  based on codes in popclient.h.
+  return value:  based on codes in fetchmail.h.
                  Do the dirty work of seeing what the status is..
  *********************************************************************/
 static int SMTP_check(int socket,char *argbuf)
@@ -188,7 +188,7 @@ static int SMTP_check(int socket,char *argbuf)
   description:   Returns the statsus of the smtp connection
   arguments:     
     socket       TCP/IP socket for connection to SMTP
-  return value:  based on codes in popclient.h.
+  return value:  based on codes in fetchmail.h.
  *********************************************************************/
 int SMTP_ok(int socket,char *argbuf)
 {
diff --git a/smtp.h b/smtp.h
index 6715fbf0..10a3bb7d 100644
--- a/smtp.h
+++ b/smtp.h
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       smtp.h
-  project:      popclient
+  project:      fetchmail
   description:  Prototypes for smtp handling code.
 
  ***********************************************************************/
diff --git a/socket.c b/socket.c
index fdbd9cb1..b2173755 100644
--- a/socket.c
+++ b/socket.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       socket.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
   description:  socket library functions
 
diff --git a/xmalloc.c b/xmalloc.c
index f9918e9c..b5d03f89 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -5,7 +5,7 @@
 
 /***********************************************************************
   module:       xmalloc.c
-  project:      popclient
+  project:      fetchmail
   programmer:   Carl Harris, ceharris@mal.com
   description:  malloc wrapper.
 
@@ -15,7 +15,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "popclient.h"
+#include "fetchmail.h"
 
 #if defined(HAVE_VOIDPOINTER)
 #define XMALLOCTYPE void