More Javadoc and naming consistency