Name parameters in all prototypes.
Merge branch 'names-in-prototypes'

* names-in-prototypes:
  Name parameters in all prototypes.