Refactor selector names