Adapted to latest renamings