Class name bug fix