Make short_name() a helper function