Singled out Compositions, partitioned Names into more classes.