I wonder if it's worth adding a comment to where these things are named to the effect that we expect to be able to pluralize them with an -s suffix.