Rename Phone and PhoneType
to VCardPhone and VCardPhoneType