Fixed class names (double dashes)