Fixed some mixed singular/plural bits

svn path=; revision=84648