MNT: slightly improve DocumentName handling
MNT: slightly improve DocumentName handling

klauer/bluesky,dchabot/bluesky,ericdill/bluesky,sameera2004/bluesky,dchabot/bluesky,klauer/bluesky,sameera2004/bluesky,ericdill/bluesky