Sprint task - add JavaDoc for API for parameters; minor renaming / unified class names; minor cleanup.
Sprint task - add JavaDoc for API for parameters - minor fix.