Single calibration function and naming cleanup