diff --git a/.appveyor-build.sh b/.appveyor-build.sh
index 8ea6283e..0b7f31ed 100644
--- a/.appveyor-build.sh
+++ b/.appveyor-build.sh
@@ -4,6 +4,6 @@ export MSYSTEM=MINGW64
 export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl
 
 sh ./autogen.sh
-./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64
+./configure --prefix=c:/projects/solanum/build --enable-openssl=/mingw64
 make -j2
 make install
diff --git a/.appveyor.yml b/.appveyor.yml
index 59ae886b..85c86f56 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,7 +9,7 @@ install:
   - ps: Push-AppveyorArtifact cygcheck.log
 build_script:
   - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; sh .appveyor-build.sh"
-#  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version"
+#  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./solanum -version"
 on_failure:
   - ps: Push-AppveyorArtifact config.log
   - ps: Push-AppveyorArtifact librb\include\librb-config.h
diff --git a/.gitignore b/.gitignore
index cfeceb18..c1043028 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,7 @@ scripts/*.tar.bz2
 scripts/*.tar.gz
 include/setup.h
 include/setup.h.in
-ircd/charybdis
+ircd/solanum
 ircd/ircd_parser.c
 ircd/ircd_parser.h
 ircd/ircd_lexer.c
@@ -74,13 +74,13 @@ tests/*.c.pid
 !tests/runtime/modules/*.so
 !tests/runtime/modules/autoload/*.so
 testsuite/ircd.pid.*
-tools/charybdis-mkpasswd
-tools/charybdis-mkfingerprint
+tools/solanum-mkpasswd
+tools/solanum-mkfingerprint
 tools/genssl
 tools/mkpasswd
 tools/viconf
 include/serno.h
-ircd/charybdis
+ircd/solanum
 ircd/version.c
 ircd/version.c.last
 /libtool
diff --git a/.travis.yml b/.travis.yml
index df5cfa31..231616e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Travis-CI Build for charybdis
+# Travis-CI Build for solanum
 # see travis-ci.org for details
 
 language: c
@@ -10,7 +10,7 @@ sudo: false
 notifications:
   irc:
     channels:
-    - "chat.freenode.net#charybdis"
+    - "chat.freenode.net#solanum"
 
 matrix:
   include:
diff --git a/README.md b/README.md
index 962f8526..3d821743 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# charybdis [![POSIX Build Status](https://travis-ci.org/charybdis-ircd/charybdis.svg?branch=master)](https://travis-ci.org/charybdis-ircd/charybdis) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/is0obsml8xyq2qk7/branch/master?svg=true)](https://ci.appveyor.com/project/kaniini/charybdis/branch/master)
+# solanum [![POSIX Build Status](https://travis-ci.org/solanum-ircd/solanum.svg?branch=master)](https://travis-ci.org/solanum-ircd/solanum) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/is0obsml8xyq2qk7/branch/master?svg=true)](https://ci.appveyor.com/project/kaniini/solanum/branch/master)
 
-Charybdis is an IRCv3 server designed to be highly scalable.  It implements IRCv3.1 and some parts of IRCv3.2.
+Solanum is an IRCv3 server designed to be highly scalable.  It implements IRCv3.1 and some parts of IRCv3.2.
 
 It is meant to be used with an IRCv3-capable services implementation such as [Atheme][atheme] or [Anope][anope].
 
@@ -15,7 +15,7 @@ It is meant to be used with an IRCv3-capable services implementation such as [At
 
 # platforms
 
-Charybdis is designed with portability in mind, but does not target older systems nor those of solely academic
+Solanum is designed with portability in mind, but does not target older systems nor those of solely academic
 interest.
 
 Do note that operating systems are only supported if they are supported by their vendor.
@@ -44,7 +44,7 @@ resolution may not be possible.
 
 ## Tier 3
 
-Anything else that hasn't been tested. Charybdis may or may not work on it; patches welcome if they don't.
+Anything else that hasn't been tested. Solanum may or may not work on it; patches welcome if they don't.
 
 # platform specific errata
 
@@ -68,7 +68,7 @@ These are known issues and workarounds for supported platforms.
 # building from git
 
 We no longer supply a prebuilt configure script in git, due to use of automake and libtool causing problems.
-You will need to run `autogen.sh` to build the autotools files prior to building charybdis.
+You will need to run `autogen.sh` to build the autotools files prior to building solanum.
 
 # feature specific requirements
 
@@ -89,7 +89,7 @@ You will need to run `autogen.sh` to build the autotools files prior to building
 
 # tips
 
- * To report bugs in charybdis, visit us at irc.charybdis.io #charybdis
+ * To report bugs in solanum, visit us at chat.freenode.net #solanum
 
  * Please read doc/index.txt to get an overview of the current documentation.
 
@@ -97,13 +97,13 @@ You will need to run `autogen.sh` to build the autotools files prior to building
 
  * The files, /etc/services, /etc/protocols, and /etc/resolv.conf, SHOULD be
    readable by the user running the server in order for ircd to start with
-   the correct settings.  If these files are wrong, charybdis will try to use
+   the correct settings.  If these files are wrong, solanum will try to use
    127.0.0.1 for a resolver as a last-ditch effort.
 
 # git access
 
- * The Charybdis GIT repository can be checked out using the following command:
-	`git clone https://github.com/charybdis-ircd/charybdis`
+ * The Solanum GIT repository can be checked out using the following command:
+	`git clone https://github.com/solanum-ircd/solanum`
 
- * Charybdis's GIT repository depot can be browsed over the Internet at the following address:
-	https://github.com/charybdis-ircd/charybdis
+ * Solanum's GIT repository depot can be browsed over the Internet at the following address:
+	https://github.com/solanum-ircd/solanum
diff --git a/authd/notice.h b/authd/notice.h
index 5a4349ab..a58c4e4d 100644
--- a/authd/notice.h
+++ b/authd/notice.h
@@ -18,8 +18,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CHARYBDIS_AUTHD_NOTICE_H__
-#define __CHARYBDIS_AUTHD_NOTICE_H__
+#ifndef __SOLANUM_AUTHD_NOTICE_H__
+#define __SOLANUM_AUTHD_NOTICE_H__
 
 typedef enum
 {
@@ -35,4 +35,4 @@ void stats_result(uint32_t cid, char letter, const char *fmt, ...);
 void stats_error(uint32_t cid, char letter, const char *fmt, ...);
 void stats_done(uint32_t cid, char letter);
 
-#endif /* __CHARYBDIS_AUTHD_NOTICE_H__ */
+#endif /* __SOLANUM_AUTHD_NOTICE_H__ */
diff --git a/authd/provider.h b/authd/provider.h
index 9f8ae6f6..4000c5d8 100644
--- a/authd/provider.h
+++ b/authd/provider.h
@@ -18,8 +18,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CHARYBDIS_AUTHD_PROVIDER_H__
-#define __CHARYBDIS_AUTHD_PROVIDER_H__
+#ifndef __SOLANUM_AUTHD_PROVIDER_H__
+#define __SOLANUM_AUTHD_PROVIDER_H__
 
 #include "stdinc.h"
 #include "authd.h"
@@ -243,4 +243,4 @@ get_provider_timeout(struct auth_client *auth, uint32_t id)
 	return auth->data[id].timeout;
 }
 
-#endif /* __CHARYBDIS_AUTHD_PROVIDER_H__ */
+#endif /* __SOLANUM_AUTHD_PROVIDER_H__ */
diff --git a/authd/providers/dnsbl.c b/authd/providers/dnsbl.c
index db0a9440..f4f5d1db 100644
--- a/authd/providers/dnsbl.c
+++ b/authd/providers/dnsbl.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: A slightly useful ircd.
+ * Solanum: a slightly advanced ircd
  * dnsbl.c: Manages DNSBL entries and lookups
  *
  * Copyright (C) 2006-2011 charybdis development team
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* Originally written for charybdis circa 2006 (by nenolod?).
+/* Originally written for solanum circa 2006 (by nenolod?).
  * Tweaked for authd. Some functions and structs renamed. Public/private
  * interfaces have been shifted around. Some code has been cleaned up too.
  * -- Elizafox 24 March 2016
diff --git a/authd/res.c b/authd/res.c
index 0336b462..71f0f742 100644
--- a/authd/res.c
+++ b/authd/res.c
@@ -105,7 +105,7 @@ static uint16_t generate_random_id(void);
  * author:
  *      paul vixie, 29may94
  *      revised for ircd, cryogen(stu) may03
- *      slightly modified for charybdis, mr_flea oct12
+ *      slightly modified for solanum, mr_flea oct12
  */
 static int
 res_ourserver(const struct rb_sockaddr_storage *inp)
diff --git a/authd/res.h b/authd/res.h
index 1fabe0b2..a6801068 100644
--- a/authd/res.h
+++ b/authd/res.h
@@ -3,11 +3,11 @@
  *
  */
 
-#ifndef _CHARYBDIS_RES_H
-#define _CHARYBDIS_RES_H
+#ifndef _SOLANUM_RES_H
+#define _SOLANUM_RES_H
 
 /* Maximum number of nameservers in /etc/resolv.conf we care about
- * In hybrid, this was 2 -- but in Charybdis, we want to track
+ * In hybrid, this was 2 -- but in Solanum, we want to track
  * a few more than that ;) --nenolod
  */
 #define IRCD_MAXNS 10
diff --git a/authd/reslib.h b/authd/reslib.h
index e8917130..c2d7fc97 100644
--- a/authd/reslib.h
+++ b/authd/reslib.h
@@ -3,8 +3,8 @@
  *
  */
 
-#ifndef _CHARYBDIS_RESLIB_H
-#define _CHARYBDIS_RESLIB_H
+#ifndef _SOLANUM_RESLIB_H
+#define _SOLANUM_RESLIB_H
 
 /* Longest hostname we're willing to work with.
  * Due to DNSBLs this is more than HOSTLEN.
diff --git a/bandb/bandb.c b/bandb/bandb.c
index 769f6fe4..44f19e69 100644
--- a/bandb/bandb.c
+++ b/bandb/bandb.c
@@ -306,7 +306,7 @@ main(int argc, char *argv[])
 	if(bandb_helper == NULL)
 	{
 		fprintf(stderr,
-			"This is the charybdis bandb for internal ircd use.\n");
+			"This is the solanum bandb for internal ircd use.\n");
 		fprintf(stderr,
 			"You aren't supposed to run me directly (did you want bantool?). Exiting.\n");
 		exit(1);
diff --git a/bandb/bantool.c b/bandb/bantool.c
index caadd920..5563a4a9 100644
--- a/bandb/bantool.c
+++ b/bandb/bantool.c
@@ -196,7 +196,7 @@ main(int argc, char *argv[])
 		rb_strlcpy(etc, ETCPATH, sizeof(ETCPATH));
 
 	fprintf(stdout,
-		"* charybdis bantool v.%s\n", BT_VERSION);
+		"* solanum bantool v.%s\n", BT_VERSION);
 
 	if(flag.pretend == false)
 	{
@@ -864,7 +864,7 @@ bt_smalldate(const char *string)
 void
 print_help(int i_exit)
 {
-	fprintf(stderr, "bantool v.%s - the charybdis database tool.\n", BT_VERSION);
+	fprintf(stderr, "bantool v.%s - the solanum database tool.\n", BT_VERSION);
 	fprintf(stderr, "Copyright (C) 2008 Daniel J Reidy <dubkat@gmail.com>\n");
 	fprintf(stderr, "This program is distributed in the hope that it will be useful,\n"
 		"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
diff --git a/configure.ac b/configure.ac
index e03c7157..dcb33659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl said functions need to be just about as complex as they already are.
 
 AC_PREREQ(2.60)
 
-AC_INIT([charybdis], [4.1.3-dev])
+AC_INIT([solanum], [1.0-dev])
 
 AC_LANG(C)
 AC_USE_SYSTEM_EXTENSIONS
@@ -13,7 +13,7 @@ AC_GNU_SOURCE
 AC_PROG_CC_C99
 
 if test x"$ac_cv_prog_cc_c99" = "xno"; then
-	AC_ERROR([charybdis requires a C99 capable compiler])
+	AC_ERROR([solanum requires a C99 capable compiler])
 fi
 
 AC_PREFIX_DEFAULT($HOME/ircd)
@@ -183,7 +183,7 @@ AC_SUBST(CRYPT_LIB)
 AC_C_BIGENDIAN
 
 dnl Check for stdarg.h - if we can't find it, halt configure
-AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - charybdis will not compile without it **])])
+AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - solanum will not compile without it **])])
 AC_CHECK_FUNCS([strlcat strlcpy])
 
 AC_TYPE_INT16_T
@@ -561,7 +561,7 @@ if test "$profile" = yes; then
 	if test "$ac_cv_c_compiler_gnu" = yes; then
 		IRC_CFLAGS="$IRC_CFLAGS -pg"
 		AC_MSG_RESULT([yes, adding -pg])
-		AC_DEFINE(CHARYBDIS_PROFILE, 1, [Define this if you are profiling.])
+		AC_DEFINE(SOLANUM_PROFILE, 1, [Define this if you are profiling.])
 	else
 		AC_MSG_RESULT([no, profile builds only work with gcc])
 	fi
@@ -646,26 +646,26 @@ AC_HELP_STRING([--enable-warnings],[Enable all sorts of warnings for debugging.]
 IRC_CFLAGS="$IRC_CFLAGS -O0"
 CFLAGS="$IRC_CFLAGS"
 
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wall], charybdis_cv_c_gcc_w_all)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wpointer-arith], charybdis_cv_c_gcc_w_pointer_arith)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wimplicit -Wnested-externs], charybdis_cv_c_gcc_w_implicit)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wcast-align], charybdis_cv_c_gcc_w_cast_align)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wcast-qual], charybdis_cv_c_gcc_w_cast_qual)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wwrite-strings], charybdis_cv_c_gcc_w_write_strings)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Werror-implicit-function-declaration], charybdis_cv_c_gcc_w_error_implicit_function_declaration)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations], charybdis_cv_c_gcc_prototypes)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wparentheses], charybdis_cv_c_gcc_parentheses)
-CHARYBDIS_C_GCC_TRY_FLAGS([-W -Wno-unused], charybdis_cv_c_gcc_w)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wextra], charybdis_cv_c_gcc_w_extra)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wshadow], charybdis_cv_c_gcc_w_shadow)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wmissing-noreturn], charybdis_cv_c_gcc_w_missing_noreturn)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wundef], charybdis_cv_c_gcc_w_undef)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wpacked], charybdis_cv_c_gcc_w_packed)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wnested-externs], charybdis_cv_c_gcc_w_nested_externs)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], charybdis_cv_c_gcc_w_unused)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wredundant-decls], charybdis_cv_c_gcc_w_redundant_decls)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wfloat-equal], charybdis_cv_c_gcc_w_float_equal)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], charybdis_cv_c_gcc_w_format)
+SOLANUM_C_GCC_TRY_FLAGS([-Wall], solanum_cv_c_gcc_w_all)
+SOLANUM_C_GCC_TRY_FLAGS([-Wpointer-arith], solanum_cv_c_gcc_w_pointer_arith)
+SOLANUM_C_GCC_TRY_FLAGS([-Wimplicit -Wnested-externs], solanum_cv_c_gcc_w_implicit)
+SOLANUM_C_GCC_TRY_FLAGS([-Wcast-align], solanum_cv_c_gcc_w_cast_align)
+SOLANUM_C_GCC_TRY_FLAGS([-Wcast-qual], solanum_cv_c_gcc_w_cast_qual)
+SOLANUM_C_GCC_TRY_FLAGS([-Wwrite-strings], solanum_cv_c_gcc_w_write_strings)
+SOLANUM_C_GCC_TRY_FLAGS([-Werror-implicit-function-declaration], solanum_cv_c_gcc_w_error_implicit_function_declaration)
+SOLANUM_C_GCC_TRY_FLAGS([-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations], solanum_cv_c_gcc_prototypes)
+SOLANUM_C_GCC_TRY_FLAGS([-Wparentheses], solanum_cv_c_gcc_parentheses)
+SOLANUM_C_GCC_TRY_FLAGS([-W -Wno-unused], solanum_cv_c_gcc_w)
+SOLANUM_C_GCC_TRY_FLAGS([-Wextra], solanum_cv_c_gcc_w_extra)
+SOLANUM_C_GCC_TRY_FLAGS([-Wshadow], solanum_cv_c_gcc_w_shadow)
+SOLANUM_C_GCC_TRY_FLAGS([-Wmissing-noreturn], solanum_cv_c_gcc_w_missing_noreturn)
+SOLANUM_C_GCC_TRY_FLAGS([-Wundef], solanum_cv_c_gcc_w_undef)
+SOLANUM_C_GCC_TRY_FLAGS([-Wpacked], solanum_cv_c_gcc_w_packed)
+SOLANUM_C_GCC_TRY_FLAGS([-Wnested-externs], solanum_cv_c_gcc_w_nested_externs)
+SOLANUM_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], solanum_cv_c_gcc_w_unused)
+SOLANUM_C_GCC_TRY_FLAGS([-Wredundant-decls], solanum_cv_c_gcc_w_redundant_decls)
+SOLANUM_C_GCC_TRY_FLAGS([-Wfloat-equal], solanum_cv_c_gcc_w_float_equal)
+SOLANUM_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], solanum_cv_c_gcc_w_format)
 
 IRC_CFLAGS="$CFLAGS"
 ],[])
diff --git a/doc/ircd.motd b/doc/ircd.motd
index 343031a0..29202cd8 100644
--- a/doc/ircd.motd
+++ b/doc/ircd.motd
@@ -1,2 +1,2 @@
-This is charybdis MOTD you might replace it, but if not your friends will
+This is solanum MOTD you might replace it, but if not your friends will
 laugh at you.
diff --git a/doc/reference.conf b/doc/reference.conf
index c489d5b5..91bbe113 100644
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1,4 +1,4 @@
-/* doc/reference.conf - charybdis Example configuration file
+/* doc/reference.conf - solanum example configuration file
  *
  * Copyright (C) 2000-2002 Hybrid Development Team
  * Copyright (C) 2002-2005 ircd-ratbox development team
diff --git a/extensions/README b/extensions/README
index 9361bb78..0c21f54d 100644
--- a/extensions/README
+++ b/extensions/README
@@ -1,4 +1,4 @@
-This directory contains extensions (modules) to charybdis ircd that
+This directory contains extensions (modules) to solanum ircd that
 have been contributed by other people, or written by our development
 team.  Unsupported extensions live under unsupported/.
 
diff --git a/extensions/chm_nonotice.c b/extensions/chm_nonotice.c
index c2dcb6b2..63295de4 100644
--- a/extensions/chm_nonotice.c
+++ b/extensions/chm_nonotice.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * chm_nonotice: block NOTICEs (+T mode).
  *
  * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
diff --git a/extensions/example_module.c b/extensions/example_module.c
index a0b501f5..bc277316 100644
--- a/extensions/example_module.c
+++ b/extensions/example_module.c
@@ -30,7 +30,7 @@
  *
  * Make it short, sweet, and to the point.
  */
-static const char example_desc[] = "This is an example Charybdis module.";
+static const char example_desc[] = "This is an example Solanum module.";
 
 /* Declare the void's initially up here, as modules dont have an
  * include file, we will normally have client_p, source_p, parc
diff --git a/extensions/hurt.c b/extensions/hurt.c
index 2baf3c58..c04c09c8 100644
--- a/extensions/hurt.c
+++ b/extensions/hurt.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  *
  * Copyright (C) 2006 charybdis development team
  * All rights reserved
diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index a650c8ab..4ae0ca92 100644
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -1,5 +1,5 @@
 /*
- * Charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * ip_cloaking.c: provide user hostname cloaking
  *
  * Written originally by nenolod, altered to use FNV by Elizabeth in 2008
diff --git a/extensions/ip_cloaking_4.0.c b/extensions/ip_cloaking_4.0.c
index 011fcc69..e298651c 100644
--- a/extensions/ip_cloaking_4.0.c
+++ b/extensions/ip_cloaking_4.0.c
@@ -1,5 +1,5 @@
 /*
- * Charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * ip_cloaking.c: provide user hostname cloaking
  *
  * Written originally by nenolod, altered to use FNV by Elizabeth in 2008
diff --git a/extensions/m_extendchans.c b/extensions/m_extendchans.c
index d9e887ee..6f2682a4 100644
--- a/extensions/m_extendchans.c
+++ b/extensions/m_extendchans.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis
+ *  solanum
  *  m_extendchans.c: Allow an oper or service to let a given user join more channels.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index 571868f7..04524898 100644
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -1,5 +1,5 @@
 /*
- *  Charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  m_omode.c: allows oper mode hacking
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/extensions/m_roleplay.c b/extensions/m_roleplay.c
index 0f26942c..bb6f010a 100644
--- a/extensions/m_roleplay.c
+++ b/extensions/m_roleplay.c
@@ -1,5 +1,5 @@
 /*
- * roleplay commands for charybdis.
+ * roleplay commands for solanum.
  *
  * adds NPC, NPCA, and SCENE which allow users to send messages from 'fake'
  * nicknames. in the case of NPC and NPCA, the nickname will be underlined
diff --git a/extensions/override.c b/extensions/override.c
index 91b3d6eb..50dae579 100644
--- a/extensions/override.c
+++ b/extensions/override.c
@@ -1,5 +1,5 @@
 /*
- * oper-override for charybdis.
+ * oper-override for solanum.
  *
  * adds usermode +p and has a timer event that is iterated over to disable
  * usermode +p after a while...
diff --git a/include/authproc.h b/include/authproc.h
index 571253f8..c062b6ff 100644
--- a/include/authproc.h
+++ b/include/authproc.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis
+ *  solanum
  *  authproc.h: A header with the authd functions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -23,8 +23,8 @@
  *  USA
  */
 
-#ifndef CHARYBDIS_AUTHD_H
-#define CHARYBDIS_AUTHD_H
+#ifndef SOLANUM_AUTHD_H
+#define SOLANUM_AUTHD_H
 
 #include "stdinc.h"
 #include "rb_dictionary.h"
diff --git a/include/certfp.h b/include/certfp.h
index 0913cade..16b71cd0 100644
--- a/include/certfp.h
+++ b/include/certfp.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  certpf.h: Fingerprint method strings
  *
  *  Copyright 2016 Simon Arlott
diff --git a/include/chmode.h b/include/chmode.h
index 54010dad..2b2eb33c 100644
--- a/include/chmode.h
+++ b/include/chmode.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: An advanced ircd.
+ *  Solanum: a slightly advanced ircd
  *  chmode.h: The ircd channel header.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/include/client.h b/include/client.h
index f1285b18..894d82fd 100644
--- a/include/client.h
+++ b/include/client.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  client.h: The ircd client header.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/include/dns.h b/include/dns.h
index 3a13c3f7..72d84077 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis
+ *  solanum
  *  dns.h: A header with the DNS functions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -23,8 +23,8 @@
  *  USA
  */
 
-#ifndef CHARYBDIS_DNS_H
-#define CHARYBDIS_DNS_H
+#ifndef SOLANUM_DNS_H
+#define SOLANUM_DNS_H
 
 #include "stdinc.h"
 #include "authproc.h"
diff --git a/include/hostmask.h b/include/hostmask.h
index 7b2ce435..2eb2a16d 100644
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  hostmask.h: A header for the hostmask code.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/include/inline/stringops.h b/include/inline/stringops.h
index b5616081..6959a1a7 100644
--- a/include/inline/stringops.h
+++ b/include/inline/stringops.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced ircd.
+ *  Solanum: a slightly advanced ircd
  *  inline/stringops.h: inlined string operations used in a few places
  *
  *  Copyright (c) 2005-2008 charybdis development team
diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index cea850ce..b89d7f85 100644
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: An advanced IRCd.
+ *  solanum: An advanced IRCd.
  *  ircd_defs.h: A header for ircd global definitions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/include/ircd_linker.h b/include/ircd_linker.h
index 7d40b513..ad7c9c89 100644
--- a/include/ircd_linker.h
+++ b/include/ircd_linker.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * ircd_linker.h: IRCd symbol table linking and maintainance
  *
  * Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
@@ -31,8 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _CHARYBDIS_IRCD_LINKER_H
-#define _CHARYBDIS_IRCD_LINKER_H
+#ifndef _SOLANUM_IRCD_LINKER_H
+#define _SOLANUM_IRCD_LINKER_H
 
 #include <dlfcn.h>
 
diff --git a/include/m_info.h b/include/m_info.h
index 94a870c3..98eeafbb 100644
--- a/include/m_info.h
+++ b/include/m_info.h
@@ -63,10 +63,10 @@ Info MyInformation[] = {
 #endif /* UH PATH */
 
 #ifdef SOMAXCONN
-	{"CHARYBDIS_SOMAXCONN", "", SOMAXCONN,
+	{"SOLANUM_SOMAXCONN", "", SOMAXCONN,
 	 "Maximum Queue Length of Pending Connections"},
 #else
-	{"CHARYBDIS_SOMAXCONN", "", CHARYBDIS_SOMAXCONN,
+	{"SOLANUM_SOMAXCONN", "", SOLANUM_SOMAXCONN,
 	 "Maximum Queue Length of Pending Connections"},
 #endif /* SOMAXCONN */
 
diff --git a/include/modules.h b/include/modules.h
index 0c746728..41d0f658 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -30,7 +30,7 @@
 #include "parse.h"
 #include "client.h" /* for IDLEN */
 
-#define MAPI_CHARYBDIS 2
+#define MAPI_SOLANUM 2
 
 #include <ltdl.h>
 
@@ -97,8 +97,8 @@ struct mapi_mheader_av1
 };
 
 #define MAPI_ORIGIN_UNKNOWN	0		/* Unknown provenance (AV1 etc.) */
-#define MAPI_ORIGIN_EXTENSION	1		/* Charybdis extension */
-#define MAPI_ORIGIN_CORE	2		/* Charybdis core module */
+#define MAPI_ORIGIN_EXTENSION	1		/* Solanum extension */
+#define MAPI_ORIGIN_CORE	2		/* Solanum core module */
 
 struct mapi_mheader_av2
 {
diff --git a/include/msgbuf.h b/include/msgbuf.h
index 085569ab..e553253e 100644
--- a/include/msgbuf.h
+++ b/include/msgbuf.h
@@ -1,5 +1,5 @@
 /*
- * charybdis - an advanced ircd.
+ * solanum - an advanced ircd.
  * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -19,8 +19,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CHARYBDIS__MSGBUF_H
-#define CHARYBDIS__MSGBUF_H
+#ifndef SOLANUM__MSGBUF_H
+#define SOLANUM__MSGBUF_H
 
 #define MAXPARA		(15)
 
diff --git a/include/privilege.h b/include/privilege.h
index a3e5bffb..1176f2bb 100644
--- a/include/privilege.h
+++ b/include/privilege.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * privilege.h: Dynamic privileges API.
  *
  * Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
@@ -21,8 +21,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CHARYBDIS_PRIVILEGE_H
-#define __CHARYBDIS_PRIVILEGE_H
+#ifndef __SOLANUM_PRIVILEGE_H
+#define __SOLANUM_PRIVILEGE_H
 
 #include "stdinc.h"
 
diff --git a/include/ratelimit.h b/include/ratelimit.h
index 8e39493e..a990f7e3 100644
--- a/include/ratelimit.h
+++ b/include/ratelimit.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  *
  * Copyright (C) 2012 Keith Buck <mr_flea@esper.net>
  *
diff --git a/include/s_assert.h b/include/s_assert.h
index d6483413..913ec1a9 100644
--- a/include/s_assert.h
+++ b/include/s_assert.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: An advanced IRCd.
+ *  solanum: An advanced IRCd.
  *  s_assert.h: Definition of the soft assert (s_assert) macro.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/include/s_conf.h b/include/s_conf.h
index da6797b5..c804dd40 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: Advanced, scalable Internet Relay Chat.
+ *  solanum: Advanced, scalable Internet Relay Chat.
  *  s_conf.h: A header for the configuration functions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/include/snomask.h b/include/snomask.h
index 2044ffce..d46608aa 100644
--- a/include/snomask.h
+++ b/include/snomask.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * snomask.h: Management for user server-notice masks.
  *
  * Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
diff --git a/include/substitution.h b/include/substitution.h
index 1242d580..8ab9006e 100644
--- a/include/substitution.h
+++ b/include/substitution.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * markup.h: parses markup into human-readable strings
  *
  * Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>
diff --git a/include/supported.h b/include/supported.h
index 2a77f095..06370a00 100644
--- a/include/supported.h
+++ b/include/supported.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  supported.h: isupport (005) numeric
  *
  *  Entirely rewritten, August 2006 by Jilles Tjoelker
diff --git a/include/tgchange.h b/include/tgchange.h
index 7e9bd052..9504c963 100644
--- a/include/tgchange.h
+++ b/include/tgchange.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  *
  * Copyright (C) 2004-2005 Lee Hardy <lee@leeh.co.uk>
  * Copyright (C) 2005-2010 Jilles Tjoelker <jilles@stack.nl>
diff --git a/include/wsproc.h b/include/wsproc.h
index 3d818146..771e4b69 100644
--- a/include/wsproc.h
+++ b/include/wsproc.h
@@ -1,5 +1,5 @@
 /*
- *  wsproc.h: An interface to the charybdis websocket helper daemon
+ *  wsproc.h: An interface to the solanum websocket helper daemon
  *  Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
  *  Copyright (C) 2007 ircd-ratbox development team
  *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
diff --git a/ircd/Makefile.am b/ircd/Makefile.am
index d4b1e31b..a157ea4f 100644
--- a/ircd/Makefile.am
+++ b/ircd/Makefile.am
@@ -69,10 +69,10 @@ libircd_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version -no-undefined
 libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/librb/src -lrb
 libircd_LTLIBRARIES = libircd.la
 
-bin_PROGRAMS = charybdis
-charybdis_SOURCES = main.c
-charybdis_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
-charybdis_LDADD = libircd.la -L$(top_srcdir)/librb/src -lrb
+bin_PROGRAMS = solanum
+solanum_SOURCES = main.c
+solanum_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
+solanum_LDADD = libircd.la -L$(top_srcdir)/librb/src -lrb
 
 install-exec-hook: install-libircdLTLIBRARIES
 	$(RM) -f version.c
diff --git a/ircd/chmode.c b/ircd/chmode.c
index 8da13bf3..6416a8c9 100644
--- a/ircd/chmode.c
+++ b/ircd/chmode.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  chmode.c: channel mode management
  *
  * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/ircd/client.c b/ircd/client.c
index 259b4a78..a1187399 100644
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced ircd.
+ *  Solanum: a slightly advanced ircd
  *  client.c: Controls clients.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -1147,7 +1147,7 @@ free_exited_clients(void *unused)
 						target_p->name, (unsigned int) target_p->status,
 						(unsigned long long)target_p->flags,  target_p->handler);
 					sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"Please report this to the charybdis developers!");
+						"Please report this to the solanum developers!");
 					found++;
 				}
 			}
@@ -1291,7 +1291,7 @@ exit_aborted_clients(void *unused)
 					abt->client->name, (unsigned int) abt->client->status,
 					(unsigned long long)abt->client->flags, abt->client->handler);
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					"Please report this to the charybdis developers!");
+					"Please report this to the solanum developers!");
 				continue;
 			}
 		}
diff --git a/ircd/extban.c b/ircd/extban.c
index 69603f14..f99d3fca 100644
--- a/ircd/extban.c
+++ b/ircd/extban.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  extban.c: extended ban types ($type:data)
  *
  * Copyright (C) 2006 charybdis development team
diff --git a/ircd/hostmask.c b/ircd/hostmask.c
index 5266ba2d..cfbab79c 100644
--- a/ircd/hostmask.c
+++ b/ircd/hostmask.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced internet relay chat daemon (ircd).
+ *  Solanum: a slightly advanced ircd
  *  hostmask.c: Code to efficiently find IP & hostmask based configs.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/ircd/ircd.c b/ircd/ircd.c
index 64292609..935aa4e9 100644
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  ircd.c: Starts up and runs the ircd.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -206,7 +206,7 @@ init_sys(void)
 		if(maxconnections <= MAX_BUFFER)
 		{
 			fprintf(stderr, "ERROR: Shell FD limits are too low.\n");
-			fprintf(stderr, "ERROR: charybdis reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
+			fprintf(stderr, "ERROR: solanum reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
 			exit(EXIT_FAILURE);
 		}
 		return;
@@ -553,7 +553,7 @@ ircd_restart_cb(const char *str)
 /*
  * Why EXIT_FAILURE here?
  * Because if ircd_die_cb() is called it's because of a fatal
- * error inside libcharybdis, and we don't know how to handle the
+ * error inside libsolanum, and we don't know how to handle the
  * exception, so it is logical to return a FAILURE exit code here.
  *    --nenolod
  */
@@ -627,7 +627,7 @@ seed_random(void *unused)
  * Side Effects - this is where the ircd gets going right now
  */
 int
-charybdis_main(int argc, char * const argv[])
+solanum_main(int argc, char * const argv[])
 {
 	int fd;
 
diff --git a/ircd/logger.c b/ircd/logger.c
index 71c45e71..b2e8cad3 100644
--- a/ircd/logger.c
+++ b/ircd/logger.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  *
  * Copyright (C) 2003 Lee H <lee@leeh.co.uk>
  * Copyright (C) 2003-2005 ircd-ratbox development team
diff --git a/ircd/main.c b/ircd/main.c
index 16771ed4..4d7092e9 100644
--- a/ircd/main.c
+++ b/ircd/main.c
@@ -1,9 +1,9 @@
 /* This file is in the public domain. */
 
-extern int charybdis_main(int argc, const char *argv[]);
+extern int solanum_main(int argc, const char *argv[]);
 
 int
 main(int argc, const char *argv[])
 {
-	return charybdis_main(argc, argv);
+	return solanum_main(argc, argv);
 }
diff --git a/ircd/modules.c b/ircd/modules.c
index 54acf80f..7e466d65 100644
--- a/ircd/modules.c
+++ b/ircd/modules.c
@@ -41,7 +41,7 @@
 #include <ltdl.h>
 
 #ifndef LT_MODULE_EXT
-#	error "Charybdis requires loadable module support."
+#	error "Solanum requires loadable module support."
 #endif
 
 rb_dlink_list module_list;
diff --git a/ircd/msgbuf.c b/ircd/msgbuf.c
index fe4e8e25..0d134e67 100644
--- a/ircd/msgbuf.c
+++ b/ircd/msgbuf.c
@@ -1,5 +1,5 @@
 /*
- * charybdis - an advanced ircd.
+ * solanum - an advanced ircd.
  * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/ircd/operhash.c b/ircd/operhash.c
index 6d1948e6..d1df2252 100644
--- a/ircd/operhash.c
+++ b/ircd/operhash.c
@@ -1,4 +1,4 @@
-/* charybdis
+/* solanum
  * operhash.c - Hashes nick!user@host{oper}
  *
  * Copyright (C) 2005 Lee Hardy <lee -at- leeh.co.uk>
diff --git a/ircd/parse.c b/ircd/parse.c
index 250424bf..c6155b6c 100644
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced ircd.
+ *  Solanum: a slightly advanced ircd
  *  parse.c: The message parser.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/ircd/privilege.c b/ircd/privilege.c
index d81bf8f3..18785db1 100644
--- a/ircd/privilege.c
+++ b/ircd/privilege.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * privilege.c: Dynamic privileges API.
  *
  * Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
diff --git a/ircd/ratelimit.c b/ircd/ratelimit.c
index 80a3701c..c924008b 100644
--- a/ircd/ratelimit.c
+++ b/ircd/ratelimit.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * ratelimit.c: Per-client ratelimiting for high-bandwidth commands.
  *
  * Copyright (c) 2012 Keith Buck <mr_flea -at- esper.net>
diff --git a/ircd/scache.c b/ircd/scache.c
index 93f5acdc..43c055d1 100644
--- a/ircd/scache.c
+++ b/ircd/scache.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis
+ *  solanum
  *  scache.c: Server names cache.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
diff --git a/ircd/snomask.c b/ircd/snomask.c
index d3986c2b..bf453542 100644
--- a/ircd/snomask.c
+++ b/ircd/snomask.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * snomask.c: Management for user server-notice masks.
  *
  * Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
diff --git a/ircd/substitution.c b/ircd/substitution.c
index 24672c7b..3301fd26 100644
--- a/ircd/substitution.c
+++ b/ircd/substitution.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * substitution.c: parses substitution-keyword expansions
  *
  * Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>
diff --git a/ircd/supported.c b/ircd/supported.c
index 35c6ea93..b04b815b 100644
--- a/ircd/supported.c
+++ b/ircd/supported.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  supported.c: isupport (005) numeric
  *
  * Copyright (C) 2006 Jilles Tjoelker
diff --git a/ircd/tgchange.c b/ircd/tgchange.c
index 0db3a194..b9f427bd 100644
--- a/ircd/tgchange.c
+++ b/ircd/tgchange.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  * tgchange.c - code for restricting private messages
  *
  * Copyright (C) 2004-2005 Lee Hardy <lee@leeh.co.uk>
diff --git a/ircd/version.c.SH b/ircd/version.c.SH
index 35818842..80cda0ff 100644
--- a/ircd/version.c.SH
+++ b/ircd/version.c.SH
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 spitshell=cat
-package=charybdis
+package=solanum
 
 echo "Extracting $package/src/version.c..."
 
diff --git a/librb/CREDITS b/librb/CREDITS
index e9715a51..aa9d2c8b 100644
--- a/librb/CREDITS
+++ b/librb/CREDITS
@@ -1,2 +1,2 @@
 librb was based on ircd-ratbox's libratbox. This contains various utility
-functions. See the CREDITS in Charybdis for more information.
+functions. See the CREDITS in Solanum for more information.
diff --git a/librb/configure.ac b/librb/configure.ac
index 8c0cb29a..f44d8443 100644
--- a/librb/configure.ac
+++ b/librb/configure.ac
@@ -20,7 +20,7 @@ dnl Checks for programs.
 AC_PROG_CC_C99
 
 if test x"$ac_cv_prog_cc_c99" = "xno"; then
-	AC_ERROR([charybdis requires a C99 capable compiler])
+	AC_ERROR([solanum requires a C99 capable compiler])
 fi
 
 
diff --git a/librb/include/rb_dictionary.h b/librb/include/rb_dictionary.h
index 2baf027d..fdedd246 100644
--- a/librb/include/rb_dictionary.h
+++ b/librb/include/rb_dictionary.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * rb_dictionary.h: Dictionary-based storage.
  *
  * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
diff --git a/librb/include/rb_radixtree.h b/librb/include/rb_radixtree.h
index 0b5d1bcc..bbccbd1c 100644
--- a/librb/include/rb_radixtree.h
+++ b/librb/include/rb_radixtree.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * rb_radixtree.h: Dictionary-based storage.
  *
  * Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
diff --git a/librb/librb.pc.in b/librb/librb.pc.in
index a2fd7da0..d9555e49 100644
--- a/librb/librb.pc.in
+++ b/librb/librb.pc.in
@@ -8,7 +8,7 @@ include_dir=@includedir@/librb
 lib_dir=@libdir@
 
 Name: librb
-Description: Portable runtime for charybdis and other things, based on libratbox
+Description: Portable runtime for solanum and other things, based on libratbox
 Version: @PACKAGE_VERSION@
 Libs: -L${lib_dir} -lrb
 Cflags: -I${include_dir}
diff --git a/librb/src/dictionary.c b/librb/src/dictionary.c
index f09aebe2..1d7b1ef0 100644
--- a/librb/src/dictionary.c
+++ b/librb/src/dictionary.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * rb_dictionary.c: Dictionary-based information storage.
  *
  * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
diff --git a/librb/src/mbedtls_ratbox.h b/librb/src/mbedtls_ratbox.h
index 72e92721..e571deab 100644
--- a/librb/src/mbedtls_ratbox.h
+++ b/librb/src/mbedtls_ratbox.h
@@ -40,7 +40,7 @@
 /*
  * Personalization string for CTR-DRBG initialization
  */
-static const char rb_mbedtls_personal_str[] = "charybdis/librb personalization string";
+static const char rb_mbedtls_personal_str[] = "solanum/librb personalization string";
 
 /*
  * Default list of supported ciphersuites
diff --git a/librb/src/radixtree.c b/librb/src/radixtree.c
index 581eba04..bc2fca5c 100644
--- a/librb/src/radixtree.c
+++ b/librb/src/radixtree.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * rb_radixtree.c: Dictionary-based information storage.
  *
  * Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
diff --git a/librb/src/version.c.SH b/librb/src/version.c.SH
index 22cb63f2..e5d0ef36 100644
--- a/librb/src/version.c.SH
+++ b/librb/src/version.c.SH
@@ -18,7 +18,7 @@ generation=`expr $generation + 1`
 
 $spitshell >version.c <<!SUB!THIS!
 /*
- *   librb: a library used by charybdis and other things
+ *   librb: a library used by solanum and other things
  *   src/version.c
  *
  *   Copyright (C) 1990 Chelsea Ashley Dyerman
diff --git a/librb/src/win32.c b/librb/src/win32.c
index a321d58f..6120b906 100644
--- a/librb/src/win32.c
+++ b/librb/src/win32.c
@@ -372,7 +372,7 @@ rb_init_netio_win32(void)
 {
 	/* this muchly sucks, but i'm too lazy to do overlapped i/o, maybe someday... -androsyn */
 	WNDCLASS wc;
-	static const char *classname = "charybdis-class";
+	static const char *classname = "solanum-class";
 
 	wc.style = 0;
 	wc.lpfnWndProc = (WNDPROC) rb_process_events;
diff --git a/m4/charybdis.m4 b/m4/charybdis.m4
index bc5f6a39..75817cd1 100644
--- a/m4/charybdis.m4
+++ b/m4/charybdis.m4
@@ -29,8 +29,8 @@ AC_DEFUN([AC_SUBST_DIR], [
         AC_SUBST($1)
 ])
 
-dnl CHARYBDIS_C_GCC_TRY_FLAGS(<warnings>,<cachevar>)
-AC_DEFUN([CHARYBDIS_C_GCC_TRY_FLAGS],[
+dnl SOLANUM_C_GCC_TRY_FLAGS(<warnings>,<cachevar>)
+AC_DEFUN([SOLANUM_C_GCC_TRY_FLAGS],[
  AC_MSG_CHECKING([GCC flag(s) $1])
  if test "${GCC-no}" = yes
  then
diff --git a/modules/cap_account_tag.c b/modules/cap_account_tag.c
index 85e8dab2..3e4edab9 100644
--- a/modules/cap_account_tag.c
+++ b/modules/cap_account_tag.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * cap_account_tag.c: implement the account-tag IRCv3.2 capability
  *
  * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
diff --git a/modules/cap_server_time.c b/modules/cap_server_time.c
index 40d75d77..1fd383fd 100644
--- a/modules/cap_server_time.c
+++ b/modules/cap_server_time.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * cap_server_time.c: implement the server-time IRCv3.2 capability
  *
  * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
diff --git a/modules/chm_nocolour.c b/modules/chm_nocolour.c
index 0a39c12f..265c7855 100644
--- a/modules/chm_nocolour.c
+++ b/modules/chm_nocolour.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * chm_nocolour: strip colours (+c mode).
  *
  * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
diff --git a/modules/chm_noctcp.c b/modules/chm_noctcp.c
index 60e4f7d5..43ad602d 100644
--- a/modules/chm_noctcp.c
+++ b/modules/chm_noctcp.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * chm_noctcp: block non-action CTCP (+C mode).
  *
  * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
diff --git a/modules/core/m_ban.c b/modules/core/m_ban.c
index b1e738d3..897a40b0 100644
--- a/modules/core/m_ban.c
+++ b/modules/core/m_ban.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * m_ban.c: Propagates network bans across servers.
  *
  *  Copyright (C) 2010 Jilles Tjoelker
diff --git a/modules/m_list.c b/modules/m_list.c
index e8947cf8..29204c64 100644
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * m_list_safelist.c: Version of /list that uses the safelist code.
  *
  * Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
diff --git a/modules/m_scan.c b/modules/m_scan.c
index 55071716..25dd2215 100644
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  m_scan.c: Provides information about various targets on various topics
  *
  *  Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
diff --git a/modules/m_snote.c b/modules/m_snote.c
index b79afbd9..37f5624b 100644
--- a/modules/m_snote.c
+++ b/modules/m_snote.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  m_snote.c: Server notice listener
  *
  *  Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
diff --git a/modules/sno_routing.c b/modules/sno_routing.c
index 241ec6f2..608ef4ff 100644
--- a/modules/sno_routing.c
+++ b/modules/sno_routing.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  sno_routing.c: Shows notices about netjoins and netsplits
  *
  *  Copyright (c) 2005-2006 Jilles Tjoelker <jilles-at-stack.nl>
diff --git a/scripts/application.sh b/scripts/application.sh
index 69b158ab..69287857 100755
--- a/scripts/application.sh
+++ b/scripts/application.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# application.sh: Special package building rules for charybdis.
+# application.sh: Special package building rules for solanum.
 #
 # Copyright (c) 2007-2008 atheme.org
 #
@@ -24,11 +24,11 @@ if [ "x$TIP" = "x" ]; then
 	exit
 fi
 
-# Charybdis wants the git head to be in include/serno.h, in its own format.
+# Solanum wants the git head to be in include/serno.h, in its own format.
 SERNO=`git log -1 --date=format:%Y%m%d --pretty=format:%cd-%h`
 DATECODE=`git log -1 --pretty=format:%ct`
 
-echo "[charybdis] Generating include/serno.h for tip $MYTIP."
+echo "[solanum] Generating include/serno.h for tip $MYTIP."
 cat << _EOF_ > include/serno.h
 /* Generated automatically by makepackage. Any changes made here will be lost. */
 #define SERNO "$SERNO"
diff --git a/ssld/ssld.c b/ssld/ssld.c
index db33486b..1939260f 100644
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -1169,7 +1169,7 @@ main(int argc, char **argv)
 	if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
 	{
 		fprintf(stderr,
-			"This is the charybdis ssld for internal ircd use.\n");
+			"This is the solanum ssld for internal ircd use.\n");
 		fprintf(stderr,
 			"You aren't supposed to run me directly. Exiting.\n");
 		exit(1);
diff --git a/tests/ircd_util.c b/tests/ircd_util.c
index 866969fb..36a3d4e6 100644
--- a/tests/ircd_util.c
+++ b/tests/ircd_util.c
@@ -31,7 +31,7 @@
 
 #define MSG "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__
 
-extern int charybdis_main(int argc, const char *argv[]);
+extern int solanum_main(int argc, const char *argv[]);
 
 static char argv0[BUFSIZE];
 static char configfile[BUFSIZE];
@@ -94,7 +94,7 @@ void ircd_util_init(const char *name)
 	ircd_paths[IRCD_PATH_BIN] = rb_strdup(buf);
 	ircd_paths[IRCD_PATH_LIBEXEC] = rb_strdup(buf);
 
-	is_int(0, charybdis_main(ARRAY_SIZE(argv) - 1, argv), MSG);
+	is_int(0, solanum_main(ARRAY_SIZE(argv) - 1, argv), MSG);
 }
 
 void ircd_util_reload_module(const char *name)
diff --git a/testsuite/ircd.conf.1 b/testsuite/ircd.conf.1
index 46e71b61..47944450 100644
--- a/testsuite/ircd.conf.1
+++ b/testsuite/ircd.conf.1
@@ -19,7 +19,7 @@ serverinfo {
 
 admin {
 	name = "Here";
-	description = "Charybdis testsuite server";
+	description = "Solanum testsuite server";
 	email = "root@localhost";
 };
 
diff --git a/testsuite/ircd.conf.2 b/testsuite/ircd.conf.2
index a94cc6e0..23cbfcb9 100644
--- a/testsuite/ircd.conf.2
+++ b/testsuite/ircd.conf.2
@@ -19,7 +19,7 @@ serverinfo {
 
 admin {
 	name = "Here";
-	description = "Charybdis testsuite server";
+	description = "Solanum testsuite server";
 	email = "root@localhost";
 };
 
diff --git a/testsuite/ircd.conf.3 b/testsuite/ircd.conf.3
index d93cb320..ebe28986 100644
--- a/testsuite/ircd.conf.3
+++ b/testsuite/ircd.conf.3
@@ -19,7 +19,7 @@ serverinfo {
 
 admin {
 	name = "Here";
-	description = "Charybdis testsuite server";
+	description = "Solanum testsuite server";
 	email = "root@localhost";
 };
 
diff --git a/testsuite/startall.sh b/testsuite/startall.sh
index df1c558e..1b383dda 100755
--- a/testsuite/startall.sh
+++ b/testsuite/startall.sh
@@ -3,6 +3,6 @@ testdir=`pwd`
 prefix=`sed -n -e 's/^#define IRCD_PREFIX "\(.*\)"/\1/p' "$testdir/../include/setup.h"`
 [ -d $prefix ] || { echo Unable to find installation prefix; exit 1; }
 
-$prefix/bin/charybdis -configfile $testdir/ircd.conf.1 -pidfile $testdir/ircd.pid.1
-$prefix/bin/charybdis -configfile $testdir/ircd.conf.2 -pidfile $testdir/ircd.pid.2
-$prefix/bin/charybdis -configfile $testdir/ircd.conf.3 -pidfile $testdir/ircd.pid.3
+$prefix/bin/solanum -configfile $testdir/ircd.conf.1 -pidfile $testdir/ircd.pid.1
+$prefix/bin/solanum -configfile $testdir/ircd.conf.2 -pidfile $testdir/ircd.pid.2
+$prefix/bin/solanum -configfile $testdir/ircd.conf.3 -pidfile $testdir/ircd.pid.3
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 607bca31..c44dee62 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,9 +1,9 @@
-bin_PROGRAMS = charybdis-mkpasswd charybdis-mkfingerprint
+bin_PROGRAMS = solanum-mkpasswd solanum-mkfingerprint
 AM_CFLAGS=$(WARNFLAGS)
 AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../librb/include -I.
 
-charybdis_mkpasswd_SOURCES = mkpasswd.c
-charybdis_mkpasswd_LDADD = ../librb/src/librb.la
+solanum_mkpasswd_SOURCES = mkpasswd.c
+solanum_mkpasswd_LDADD = ../librb/src/librb.la
 
-charybdis_mkfingerprint_SOURCES = mkfingerprint.c
-charybdis_mkfingerprint_LDADD = ../librb/src/librb.la
+solanum_mkfingerprint_SOURCES = mkfingerprint.c
+solanum_mkfingerprint_LDADD = ../librb/src/librb.la
diff --git a/tools/README.mkpasswd b/tools/README.mkpasswd
index 2bae860c..c09b4ab3 100644
--- a/tools/README.mkpasswd
+++ b/tools/README.mkpasswd
@@ -32,7 +32,7 @@ A Blowfish salt consists of up to 22 alphanumeric characters (plus '.' and
 Blowfish may not always be available, but MD5, SHA256, and SHA512 are
 guaranteed to be.
 
-This program should work anywhere Charybdis does; if you find otherwise, file
+This program should work anywhere Solanum does; if you find otherwise, file
 a bug.
 
  * Blowfish's rounds parameter is a logarithm, not an integer value
diff --git a/wsockd/wsockd.c b/wsockd/wsockd.c
index 2f131004..82f2f89f 100644
--- a/wsockd/wsockd.c
+++ b/wsockd/wsockd.c
@@ -1,5 +1,5 @@
 /*
- *  wsockd.c: charybdis websockets helper
+ *  wsockd.c: solanum websockets helper
  *  Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
  *  Copyright (C) 2007 ircd-ratbox development team
  *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
@@ -961,7 +961,7 @@ main(int argc, char **argv)
 	if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
 	{
 		fprintf(stderr,
-			"This is the charybdis wsockd for internal ircd use.\n");
+			"This is the solanum wsockd for internal ircd use.\n");
 		fprintf(stderr,
 			"You aren't supposed to run me directly. Exiting.\n");
 		exit(1);