Rename message queue variable names