JAVA-1215: Updated Javadoc
JAVA-1215: Changed "remove" to "delete" and "filter" to "criteria"