Fixed #424. Fixed automatic class name generation