add short_name support