Update contact interface names
Fix remainder of ContactManager