minor name refactorings - make terminology closer to lucene