Ok, but is it really right place where we need to handle this?
Instead of getting short name when we really need whort name, we should copy-paste boilerplate code, generating FQN. Maybe this is a program design question, not for this concrete PR.