Changed the name of the locators to something more adequate.