Change param definitions to work with Validator 1.0

Do not submit, this makes it break with older Validator, and 1.0 has not been merged into master yet

Change-Id: I0e600242d0f843a3cd89c6b5d94c0821fb5d0e65