Renamed selectors to match pattern.
More renaming to match pattern.