Support for shortnames