diff --git a/lib/mbselib.h b/lib/mbselib.h
index b2978c62..1eadf904 100644
--- a/lib/mbselib.h
+++ b/lib/mbselib.h
@@ -2030,16 +2030,16 @@ struct _route {
 
 
 /*
- * IRC servers to connect to.
+ * IBC servers to connect to.
  */
 #ifdef	USE_EXPERIMENT
-struct _ircsrvhdr {
+struct _ibcsrvhdr {
 	long		hdrsize;		/* Size of header	    */
 	long		recsize;		/* Size of record	    */
 };
 
 
-struct _ircsrv {
+struct _ibcsrv {
 	char		server[64];		/* Peer server name	    */
 	char		passwd[16];		/* Password		    */
 	unsigned	Active	    : 1;	/* Is server active	    */
@@ -2664,8 +2664,8 @@ struct	_routehdr	routehdr;		/* Routing file		    */
 struct	_route		route;
 
 #ifdef	USE_EXPERIMENT
-struct	_ircsrvhdr	ircsrvhdr;		/* IRC servers		    */
-struct	_ircsrv		ircsrv;
+struct	_ibcsrvhdr	ibcsrvhdr;		/* IBC servers		    */
+struct	_ibcsrv		ibcsrv;
 #endif
 
 
diff --git a/mbtask/Makefile b/mbtask/Makefile
index dfbfa8b0..3e88794c 100644
--- a/mbtask/Makefile
+++ b/mbtask/Makefile
@@ -4,13 +4,13 @@
 
 include ../Makefile.global
 
-SRCS		= callstat.c scanout.c taskcomm.c taskinfo.c taskstat.c taskirc.c \
+SRCS		= callstat.c scanout.c taskcomm.c taskinfo.c taskstat.c taskibc.c \
 		  mbtask.c outstat.c signame.c taskdisk.c taskregs.c taskutil.c \
 		  ports.c calllist.c ping.c taskchat.c crc.c
 HDRS		= callstat.h mbtask.h outstat.h signame.h taskdisk.h taskregs.h  taskutil.h \
-		  scanout.h taskcomm.h taskinfo.h taskstat.h taskirc.h \
+		  scanout.h taskcomm.h taskinfo.h taskstat.h taskibc.h \
 		  ports.h calllist.h ping.h taskchat.h
-OBJS		= callstat.o scanout.o taskcomm.o taskinfo.o taskstat.o taskirc.o \
+OBJS		= callstat.o scanout.o taskcomm.o taskinfo.o taskstat.o taskibc.o \
 		  mbtask.o outstat.o signame.o taskdisk.o taskregs.o taskutil.o \
 		  ports.o calllist.o ping.o taskchat.o crc.o
 SLIBS		= ../lib/libnodelist.a
@@ -73,8 +73,8 @@ scanout.o: ../config.h ../lib/mbselib.h taskutil.h scanout.h
 taskcomm.o: ../config.h ../lib/mbselib.h taskstat.h taskregs.h taskdisk.h taskinfo.h taskutil.h taskchat.h taskcomm.h
 taskinfo.o: ../config.h ../lib/mbselib.h taskinfo.h
 taskstat.o: ../config.h ../lib/mbselib.h taskstat.h callstat.h outstat.h taskutil.h
-taskirc.o: ../config.h ../lib/mbselib.h taskirc.h
-mbtask.o: ../config.h ../lib/mbselib.h ../paths.h signame.h taskstat.h taskutil.h taskregs.h taskcomm.h taskdisk.h taskirc.h callstat.h outstat.h ../lib/nodelist.h ports.h calllist.h ping.h taskchat.h mbtask.h
+taskibc.o: ../config.h ../lib/mbselib.h taskibc.h
+mbtask.o: ../config.h ../lib/mbselib.h ../paths.h signame.h taskstat.h taskutil.h taskregs.h taskcomm.h taskdisk.h taskibc.h callstat.h outstat.h ../lib/nodelist.h ports.h calllist.h ping.h taskchat.h mbtask.h
 outstat.o: ../config.h ../lib/mbselib.h taskutil.h taskstat.h scanout.h ../lib/nodelist.h callstat.h ports.h outstat.h
 signame.o: ../config.h signame.h
 taskdisk.o: ../config.h ../lib/mbselib.h taskdisk.h taskutil.h
@@ -83,6 +83,6 @@ taskutil.o: ../config.h ../lib/mbselib.h signame.h scanout.h taskutil.h
 ports.o: ../config.h ../lib/mbselib.h taskutil.h ../lib/nodelist.h ports.h
 calllist.o: ../config.h ../lib/mbselib.h taskstat.h taskutil.h callstat.h outstat.h mbtask.h calllist.h
 ping.o: ../config.h ../lib/mbselib.h taskstat.h taskutil.h ping.h
-taskchat.o: ../config.h ../lib/mbselib.h taskutil.h taskregs.h taskchat.h taskirc.h
+taskchat.o: ../config.h ../lib/mbselib.h taskutil.h taskregs.h taskchat.h taskibc.h
 crc.o: ../config.h ../lib/mbselib.h
 # End of generated dependencies
diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c
index 60cf3c05..b836226e 100644
--- a/mbtask/mbtask.c
+++ b/mbtask/mbtask.c
@@ -37,7 +37,7 @@
 #include "taskregs.h"
 #include "taskcomm.h"
 #include "taskdisk.h"
-#include "taskirc.h"
+#include "taskibc.h"
 #include "callstat.h"
 #include "outstat.h"
 #include "../lib/nodelist.h"
@@ -116,7 +116,7 @@ extern int		ping_run;		/* Ping running		*/
 int			sched_run = FALSE;	/* Scheduler running	*/
 extern int		disk_run;		/* Disk watch running	*/
 #ifdef	USE_EXPERIMENT
-extern int		irc_run;		/* IRC thread running	*/
+extern int		ibc_run;		/* IBC thread running	*/
 #endif
 
 
@@ -128,7 +128,7 @@ pthread_t	pt_command;
 pthread_t	pt_disk;
 pthread_t	pt_scheduler;
 #ifdef	USE_EXPERIMENT
-pthread_t	pt_irc;
+pthread_t	pt_ibc;
 #endif
 
 
@@ -746,14 +746,14 @@ void die(int onsig)
      */
     now = time(NULL) + 2;
 #ifdef	USE_EXPERIMENT
-    while ((cmd_run || ping_run || sched_run || disk_run || irc_run) && (time(NULL) < now)) {
+    while ((cmd_run || ping_run || sched_run || disk_run || ibc_run) && (time(NULL) < now)) {
 #else
     while ((cmd_run || ping_run || sched_run || disk_run) && (time(NULL) < now)) {
 #endif
 	sleep(1);
     }
 #ifdef	USE_EXPERIMENT
-    if (cmd_run || ping_run || sched_run || disk_run || irc_run)
+    if (cmd_run || ping_run || sched_run || disk_run || ibc_run)
 #else
     if (cmd_run || ping_run || sched_run || disk_run)
 #endif
@@ -1048,8 +1048,8 @@ void start_scheduler(void)
 	WriteError("$pthread_create scheduler rc=%d", rc);
 	die(SIGTERM);
 #ifdef	USE_EXPERIMENT
-    } else if ((rc = pthread_create(&pt_irc, NULL, (void (*))irc_thread, NULL))) {
-	WriteError("$pthread_create irc rc=%d", rc);
+    } else if ((rc = pthread_create(&pt_ibc, NULL, (void (*))ibc_thread, NULL))) {
+	WriteError("$pthread_create ibc rc=%d", rc);
 	die(SIGTERM);
 #endif
     } else {
diff --git a/mbtask/taskchat.c b/mbtask/taskchat.c
index c5941b1b..2c0727f0 100644
--- a/mbtask/taskchat.c
+++ b/mbtask/taskchat.c
@@ -33,7 +33,7 @@
 #include "taskutil.h"
 #include "taskregs.h"
 #include "taskchat.h"
-#include "taskirc.h"
+#include "taskibc.h"
 
 
 #define	MAXCHANNELS 10		    /* Maximum chat channels		*/
diff --git a/mbtask/taskirc.c b/mbtask/taskibc.c
similarity index 91%
rename from mbtask/taskirc.c
rename to mbtask/taskibc.c
index a1cd6a4a..162b6605 100644
--- a/mbtask/taskirc.c
+++ b/mbtask/taskibc.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  *
  * $Id$
- * Purpose ...............: mbtask - Internet Realy Chat (sort of)
+ * Purpose ...............: mbtask - Internet BBS Chat (but it looks like...)
  *
  *****************************************************************************
  * Copyright (C) 1997-2005
@@ -30,13 +30,13 @@
 
 #include "../config.h"
 #include "../lib/mbselib.h"
-#include "taskirc.h"
+#include "taskibc.h"
 
 
 
 #ifdef  USE_EXPERIMENT
 
-int		irc_run = FALSE;	    /* Thread running	    */
+int		ibc_run = FALSE;	    /* Thread running	    */
 extern int	T_Shutdown;		    /* Program shutdown	    */
 
 
@@ -115,17 +115,17 @@ void send_all(char *msg)
 /*
  * IRC thread
  */
-void *irc_thread(void *dummy)
+void *ibc_thread(void *dummy)
 {
-    Syslog('+', "Starting IRC thread");
-    irc_run = TRUE;
+    Syslog('+', "Starting IBC thread");
+    ibc_run = TRUE;
 
     while (! T_Shutdown) {
 	sleep(1);
     }
 
-    irc_run = FALSE;
-    Syslog('+', "IRC thread stopped");
+    ibc_run = FALSE;
+    Syslog('+', "IBC thread stopped");
     pthread_exit(NULL);
 }
 
diff --git a/mbtask/taskirc.h b/mbtask/taskibc.h
similarity index 53%
rename from mbtask/taskirc.h
rename to mbtask/taskibc.h
index c2b65b3b..d0fce990 100644
--- a/mbtask/taskirc.h
+++ b/mbtask/taskibc.h
@@ -1,11 +1,11 @@
-#ifndef _TASKIRC_H
-#define	_TASKIRC_H
+#ifndef _TASKIBC_H
+#define	_TASKIBC_H
 
 /* $Id$ */
 
 #ifdef	USE_EXPERIMENT
 void send_all(char *);
-void *irc_thread(void *);
+void *ibc_thread(void *);
 #endif
 
 #endif