REF+DOC: javadoc + class names update
REF+DOC: javadoc + class names update
Merge commit 'e7373916026826b623b1224546e7f5e640d38395'