Adapted to modifications in naming in main lib.