Renamed some ontology datatypes