renamed some plurals for consistency in the count methods