#1 fixed - bad class name generation