Worng class name fixes