I'm fine with changing the names. If we are not going to create the collections upfront, then we would need to call a method to get the message and queue collections to make sure we have selected the collection.