LPS-33079 Make it consistent with the other checkers
LPS-33455 fix ambiguity