move some name hacks into the indexer