Removed hardcoded shortname