Adapt to function name changes