Revert "Renamed Selectors"

This reverts commit c9d701810c1f2e87b1fe984459c0804ee4fac98a.