Adjusted evaluations to renamings, fixed a signature.