actually fixed class names