Changes to allow unique names