Fixed generated names with a dash is present