Fix changed varable names