Fixes + Contact Rename