fix parameter names and validation

[merge]