- improved shortname replacement (huge performance increase)