Use the name if available instead of the default name.

Use the name if available instead of the default name. #15118