TD 3712 Handle ShortNames as well as Abbreviations