Update annotations

- Revert changes applied with 3389ae3
- Update names of parameters to reflect keys used in option array
- Use int instead of integer for type