Bug fixes, Added the option to generate unique names