Update.
Name everything in the singular for consitency.