we should rename here as well, and the locators don't match anymore