refactor: rename some variables
refactor ontologyservers and create tests