updated for method and class name changes