irc order switch elimination (#37), method renames