Rename internal variables