fix and change name of var