refactorig naming in queue