Rename properties of contact.
Review of code.