Fix errors from avoacado renames.