fixed class name errors