Fixed accessor and did some minor renaming.