Update queues name (fix on the Generator core)

There was name conflicts between queue names and methods names. So queues names been updated.