Simplify class name