Refactor class names, chose more abbreviate terms
Update javadocs