Test and fix name generation