fixed non-unique names