update with short name support