remove unnecessary 2D in class names