Names changed in calc.h