Renaming these classes to reflect the Selectors Level 4 spec.