RPO classes and properties renamed conflict->difference