Make the API consistent about whether object names are plural in