Fixed common class name bug