Rename some variables (related to the queue structure)