add short name support