Version agnostic locators

Agreed - those names are better.