Rename fields and Add javadoc