Renamve vars to the correct names