Renamed classes to correct form.