fix warnings with scope and rename EVAL