More JavaDoc, method name changes