Move d_name before d_short_name