#53: Swap type and classifier to follow the order used on another places of MRB