ISS-17 Added a dummy for Calibration.
ISS-17 Some small fixes in classes' names.