Even though the documentation mentioned it, the implementation wasn't generating unique names. Fix it.