Fixed some more class names