Renamed and made javadoc changes