fixed class name generation