Adapted to change of ontology namespace