change naming strategy as discussed on irc