Fixed some more names also.