Use singular names for count fields