We have the same situation - it's not as bad for vApps/VMs created in 9.5 as they get the 'new' format name (VM with 4 character suffix after a '-'), but for VMs created in previous releases using the old GUID naming it's a bit of a pain.
I actually think that vCD should display the 4-character suffix and offer a way to migrate the old (GUID) names to this pattern. I like that tenants can create 20 servers called 'test1' (for example) and have these not conflict with each other, but if you do this, in the vCD interface there's no way to distinguish which server is which. (And yes, we have some tenants that like to do things like this...)