Changed names of "Address Info" and