Some BaseObject renames + Contacts refactoring