Improved rendering of class name