Updated specification.

* Longer name for arguments should be supported as well.
* Reformat