Change queue names to reflect better purpose