Fixed bug from function name changes.