Update locator naming