Update contact interface names
Update to AliasMap
Update ContactPresence -> PresenceMap
SQUASH ME: Fix last commit