QueueName refactoring