Update and rename calc to eval