Merge "Fix updated method names in javadoc." into main