Removed 'index' separator from pri and sec indexes.