Make selectors more consistent