Renamed classes: Defs become Descriptors.