Improve saved variables names

Improve saved variables names