Revert to shorter OK/KO labels, close #2252