#22572 - Updated to use same display-name fallback as Work Files