Renamed classes according to CaMl case.