Index name duplication fix