Shortname fix, cleanup