Fixed a lot of contact to member naming.