Refine queue names