Updated uuid naming to do name+uuid if name is present