Changed names of concepts and sets