Rename Diagnostic to Descriptor to eliminate a name alias