Made zone name and hsm key locator unique.