Update and rename Variable.php to VariableExpression.php