references to classes replaced
javadoc updated