calibration: Respect system units; fix unit name.