Duplicate callback fixes and method name change