...which obsoletes the ircbas_ naming.  refactor some more in the process.