Renamed classes and introduced Normalizer.