[MOD] More work done on name indexes.