Feature/class name error