Update and rename BooleanAnd.php to BooleanAndExpression.php