Add proper element names for address-related entities