COOK-2611 Reworking to allow for renaming of default queue