fix javadocs and names