Update javadocs, remove old class names