replaces margin_order with 'Margin' short_order with 'Short' etc. #273