Note that short_name may be null. Fixes #1023