Change to new Order ID scheme