Use descriptors in filename

Please see commit comments.