Switch to new prepare functions also in generalization code

Switch to new prepare functions also in generalization code #1877