Updated property names to match calibration api

Now matches calibration_api variable names from
cc01804980e44e3bac7f09a632b11c10e4305083
means that these values rather than the defaults to be saved to config
file and hence allow 44100 sample rate
Fixed up test to match tthe code
Merge branch 'Pete5746218-cfg-fix'