Fix Short_name

Return name if no short_name is defined