We should also add the suffix "_locator" after all the locator names.