HM/JPM: more renames to get rid of confusing 'public' interface and overloaded meanings of the word 'index'