can you rename this version of `msg_queue` too :)

after this we are ready to merge, I think