Corrected some Ch.... to CH... that have been automatically converted, by mistake, during the refactorization.
Merge branch 'develop'