Update locators to use IDs