fix expansion short name processing