Harmonize Class names