Refactor queue names

this is good to merge when tests pass