Switch to new defaults for queue names