Use PLURAL uppercase consistently.

Change-Id: I5c394538b19c2af20bb6bfd2bbb9744af037fd8c