Update to reflect recent method name changes