Reworking descriptor labeling. Descriptors are now labeled with the object name.