started queue_name refactoring