organise: refactor peep / staff window names