Added unique names and white space replacement