Use correct shortname.