Renamed order into weight in CGM as well.