Names and locators have been corrected