Fix overlapping list names