Changed function names, adapted to changes in function names in Cyclops.