Adapted to new tool name