Rename Variable conversion functions

for #598