class name adjustments