warning fix, vars renaming