Method name changes plus JavaDoc