Move toward more consistent queue/topic name management.