TODO: added messagesniffer to rename list