Remove `sort_order` and `sort_mode` in favor of `order` and `mode`

Closes #2781