Updated vars to suit new repo layout