Move queue name to macros