TODO: remove messagesniffer from rename list