Sync with the latest Selectors terminology