Better name generation for classes