fix ToStringExpression and namings