Renamed a few members
Updated screenshots