Fix buffer-naming in exec/eval