Simplify generate-name