deque: rename part 2; some simplification