Adjust base.orders to new modules