#8 improve naming conventions for legacy selectors