CFY-598 fixes after queue name change