Fix plural and capitalization