Fix a name clash and a nasty bug no name generation.