OntologyIndex: variable renaming, simplifications