Updated Expression and Evaluator names to more accurately represent
their purpose.