Fixed class name bugs

Some errors while manually typing class names and select statements have
been fixed.