Changed ontology for swapping