Adjust class names