Use plularized URLs for better consistency.

Closes #684.