clean up and namegenerator works again