Short name support

... ...