Confusion between shortname and themename shows up for univie,
where shortname is ucloud (argh) and themename is univie (yeah!)

The changed templates should make no difference in normal casese, but should fix
case "Desktop Branding at Uni Vienna    [ ref:_00Di0L0AX._500i0AYUS5:ref ]"