diff --git a/include/client.h b/include/client.h
index 5e69e89d1..b8ca05019 100644
--- a/include/client.h
+++ b/include/client.h
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if !defined(CONFIG_RATBOX_LEVEL_1)
+#if !defined(CONFIG_CHARYBDIS_LEVEL_1)
 #error Incorrect config.h for this revision of ircd.
 #endif
 
diff --git a/include/config.h b/include/config.h
index 44e643009..6ba69963b 100644
--- a/include/config.h
+++ b/include/config.h
@@ -91,11 +91,11 @@
  */
 #define KILLCHASETIMELIMIT 90	/* Recommended value: 90 */
 
-/* RATBOX_SOMAXCONN
+/* CHARYBDIS_SOMAXCONN
  * Use SOMAXCONN if OS has it, otherwise use this value for the
  * listen(); backlog.  5 for AIX/SUNOS, 25 for other OSs.
  */
-#define RATBOX_SOMAXCONN 25
+#define CHARYBDIS_SOMAXCONN 25
 
 /* MAX_BUFFER
  * The amount of fds to reserve for clients exempt from limits
@@ -110,7 +110,7 @@
  * ----------------------------------------------------------------
  */
 
-#define CONFIG_RATBOX_LEVEL_2
+#define CONFIG_CHARYBDIS_LEVEL_2
 
 #include "defaults.h"
 #endif /* INCLUDED_config_h */
diff --git a/include/config.h.dist b/include/config.h.dist
index ec0c9e75e..f143506e8 100644
--- a/include/config.h.dist
+++ b/include/config.h.dist
@@ -91,11 +91,11 @@
  */
 #define KILLCHASETIMELIMIT 90	/* Recommended value: 90 */
 
-/* RATBOX_SOMAXCONN
+/* CHARYBDIS_SOMAXCONN
  * Use SOMAXCONN if OS has it, otherwise use this value for the 
  * listen(); backlog.  5 for AIX/SUNOS, 25 for other OSs.
  */
-#define RATBOX_SOMAXCONN 25
+#define CHARYBDIS_SOMAXCONN 25
 
 /* MAX_BUFFER
  * The amount of fds to reserve for clients exempt from limits
@@ -110,7 +110,7 @@
  * ----------------------------------------------------------------
  */
 
-#define CONFIG_RATBOX_LEVEL_2
+#define CONFIG_CHARYBDIS_LEVEL_2
 
 #include "defaults.h"
 #endif /* INCLUDED_config_h */
diff --git a/include/defaults.h b/include/defaults.h
index 0ec3d6a4a..a7f1dc909 100644
--- a/include/defaults.h
+++ b/include/defaults.h
@@ -59,5 +59,5 @@
 #define JOIN_LEAVE_COUNT_EXPIRE_TIME 120
 #define MIN_SPAM_NUM 5
 #define MIN_SPAM_TIME 60
-#define CONFIG_RATBOX_LEVEL_1
+#define CONFIG_CHARYBDIS_LEVEL_1
 #endif				/* INCLUDED_defaults_h */
diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index a8ef286e1..0822a37e6 100644
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -56,7 +56,7 @@
 #define IRC_DEPRECATED
 #endif
 
-#if !defined(CONFIG_RATBOX_LEVEL_1)
+#if !defined(CONFIG_CHARYBDIS_LEVEL_1)
 #  error Incorrect config.h for this revision of ircd.
 #endif
 
diff --git a/include/m_info.h b/include/m_info.h
index 61602960f..00eb0ab3e 100644
--- a/include/m_info.h
+++ b/include/m_info.h
@@ -63,10 +63,10 @@ Info MyInformation[] = {
 #endif /* UH PATH */
 
 #ifdef SOMAXCONN
-	{"RATBOX_SOMAXCONN", "", SOMAXCONN,
+	{"CHARYBDIS_SOMAXCONN", "", SOMAXCONN,
 	 "Maximum Queue Length of Pending Connections"},
 #else
-	{"RATBOX_SOMAXCONN", "", RATBOX_SOMAXCONN,
+	{"CHARYBDIS_SOMAXCONN", "", CHARYBDIS_SOMAXCONN,
 	 "Maximum Queue Length of Pending Connections"},
 #endif /* SOMAXCONN */
 
diff --git a/ircd/listener.c b/ircd/listener.c
index 5fbfa3f79..b191333f8 100644
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -159,11 +159,11 @@ show_ports(struct Client *source_p)
  * returns true (1) if successful false (0) on error.
  *
  * If the operating system has a define for SOMAXCONN, use it, otherwise
- * use RATBOX_SOMAXCONN
+ * use CHARYBDIS_SOMAXCONN
  */
 #ifdef SOMAXCONN
-#undef RATBOX_SOMAXCONN
-#define RATBOX_SOMAXCONN SOMAXCONN
+#undef CHARYBDIS_SOMAXCONN
+#define CHARYBDIS_SOMAXCONN SOMAXCONN
 #endif
 
 static int
@@ -253,7 +253,7 @@ inetport(struct Listener *listener)
 		return 0;
 	}
 
-	if(rb_listen(F, RATBOX_SOMAXCONN, listener->defer_accept))
+	if(rb_listen(F, CHARYBDIS_SOMAXCONN, listener->defer_accept))
 	{
 		errstr = strerror(rb_get_sockerr(F));
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,