Fix name generation