Made the nomenclature slightly less application-centric.