update locators to work with proposed changes