Follow up to Add OrderType class and table - TRUNK-4286

Follow up - TRUNK-4286