variable rename

update of variable names