Refactor selector naming convention