fix name generation