Change plural package names to be singular

We have several cases where we're using package names that are plural. Many style guides recommend using singular nouns. Above all, we need to be consistent (which we're not).

It's better to make these changes now rather than later.