changed address name creation to be faster